Skip to content

Commit

Permalink
Merge pull request #700 from nandhu-kumar/develop
Browse files Browse the repository at this point in the history
MOSIP-33845
  • Loading branch information
ckm007 authored Jul 18, 2024
2 parents f010241 + c12be1c commit ac49608
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -83,58 +83,7 @@ public static void main(String[] arg) {
KeycloakUserManager.createUsers();
KeycloakUserManager.closeKeycloakInstance();

List<String> localLanguageList = new ArrayList<>(BaseTestCase.getLanguageList());
AdminTestUtil.getLocationData();

String partnerKeyURL = "";
String updatedPartnerKeyURL = "";
String ekycPartnerKeyURL = "";

if (BaseTestCase.listOfModules.contains("auth")
|| BaseTestCase.listOfModules.contains(GlobalConstants.ESIGNET)) {
PartnerRegistration.deleteCertificates();
CertificateGenerationUtil.getThumbprints();
AdminTestUtil.createAndPublishPolicy();
AdminTestUtil.createEditAndPublishPolicy();
partnerKeyURL = PartnerRegistration.generateAndGetPartnerKeyUrl();
updatedPartnerKeyURL = PartnerRegistration.generateAndGetUpdatedPartnerKeyUrl();

AdminTestUtil.createAndPublishPolicyForKyc();
ekycPartnerKeyURL = PartnerRegistration.generateAndGetEkycPartnerKeyUrl();

}

if (BaseTestCase.listOfModules.contains(GlobalConstants.MASTERDATA)) {
AdminTestUtil.getHierarchyZoneCode();
BaseTestCase.mapUserToZone();
BaseTestCase.mapZone();
AdminTestUtil.getLocationLevelData();
AdminTestUtil.getLocationData();
AdminTestUtil.getZoneName();



for (int i = 0; i < localLanguageList.size(); i++) {
BaseTestCase.languageList.clear();
BaseTestCase.languageList.add(localLanguageList.get(i));

DBManager.clearMasterDbData();
BaseTestCase.currentModule = GlobalConstants.MASTERDATA;
BaseTestCase.setReportName("masterdata-" + localLanguageList.get(i));
startTestRunner();

}

} else if (BaseTestCase.listOfModules.contains("auth")
|| BaseTestCase.listOfModules.contains(GlobalConstants.ESIGNET)) {
if (partnerKeyURL.isEmpty())
// if (partnerKeyURL.isEmpty() || ekycPartnerKeyURL.isEmpty())
LOGGER.error("partnerKeyURL is null");
else
startTestRunner();
} else {
startTestRunner();
}
startTestRunner();
} catch (Exception e) {
LOGGER.error("Exception " + e.getMessage());
}
Expand Down
24 changes: 13 additions & 11 deletions apitest/src/main/resources/config/Kernel.properties
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ s3-account = automation
s3-region = null
reportExpirationInDays = 3
s3-account-for-persona-data = personaData
push-reports-to-s3 = no
push-reports-to-s3 = yes


#-------------------- Keycloak User Creation proprties ----------------------#
Expand All @@ -171,10 +171,11 @@ keycloak_UserName = admin
keycloak_Password = sMDr9Ainw9
keycloak-external-url = https://iam.qa-inji.mosip.net
keycloak-realm-id = mosip
iam-users-to-create = 111997,111998,220005,111992,globaladmin,111887
iam-users-to-create = 111997,111998,220005,111992,globaladmin,111887,111999
iam-users-password = mosip123,mosip123,mosip123,mosip123,mosip123
roles.220005 = GLOBAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN
roles.111997 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
roles.111999 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
roles.111887 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,REGISTRATION_SUPERVISOR
roles.111998 = POLICYMANAGER
roles.111992 = GLOBAL_ADMIN
Expand Down Expand Up @@ -239,14 +240,15 @@ usePreConfiguredOtp=true
# supported values yes or no. Assume that by Default e-signet is deployed
eSignetDeployed=yes
partnerUrlSuffix=oYf63Lax0DY2QkYMRHnrmDqhmO3RMWQagwm0ftgLlkuin1KOND/666/576732
reportIgnoredTestCases=yes
reportIgnoredTestCases=no
servicesNotDeployed=
esignetMockBaseURL=esignet-insurance.
slack-webhook-url=
serverErrorsToMonitor=IDA-MLC-018
pmsAuthInternal=true
partner_password=mosip123
partner_userName=111997
partner_revamp_userName=111999
partner_user_password=mosip123
policytest_password=mosip123
policytest_userName=111998
Expand All @@ -268,11 +270,11 @@ langselect=0


#----------------------------------AuthDemoService Host properties----------------------------------------------------------#
#Uncommemnt the below to run locally
authDemoServiceBaseURL=http://localhost
authDemoServicePort=8082
authCertsPath=
#Uncommemnt the below to run in Docker
#authDemoServiceBaseURL=http://authdemo.apitestrig
#authDemoServicePort=80
#authCertsPath=/home/mosip/authcerts
#authCertsPath=
authCertsPath=/home/mosip/authcerts




mosip_components_base_urls=
#auditmanager=api-internal.dev1.mosip.net;idrepository=api-internal.dev1.mosip.net;partnermanager=api-internal.qa-inji.mosip.net;idauthentication=api-internal.qa-inji.mosip.net;policymanager=api-internal.qa-inji.mosip.net

0 comments on commit ac49608

Please sign in to comment.