Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@nandhu-kumar
nandhu-kumar committed Sep 26, 2023
2 parents bd4aafa + 40d6bc4 commit 42779a1
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 7 deletions.
4 changes: 2 additions & 2 deletions automationtests/src/main/java/io/mosip/testrig/apirig/admin/fw/util/AdminTestUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4899,9 +4899,9 @@ public static Certificate convertToCertificate(String certData) {

public static int getOtpExpTimeFromActuator() {
if (otpExpTime.isEmpty()) {
String section = "configService:https://github.com/mosip/mosip-config/application-default.properties";
String section = "/mosip-config/application-default.properties";
if (!BaseTestCase.isTargetEnvLTS())
section = "configService:https://github.com/mosip/mosip-config/sandbox/application-lts.properties";
section = "/mosip-config/sandbox/application-lts.properties";
Response response = null;
org.json.JSONObject responseJson = null;
JSONArray responseArray = null;
Expand Down
14 changes: 9 additions & 5 deletions automationtests/src/main/java/io/mosip/testrig/apirig/service/BaseTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,16 +555,20 @@ public static List<String> getLanguageList() {
String optionalLanguages=null;
String mandatoryLanguages=null;
if (isTargetEnvLTS())
section = "/mosip/mosip-config/application-default.properties";
section = "/mosip-config/application-default.properties";
else
section = "/mosip/mosip-config/sandbox/admin-mz.properties";
section = "/mosip-config/sandbox/admin-mz.properties";
try {

optionalLanguages = getValueFromActuators(propsKernel.getProperty("actuatorAdminEndpoint"),
section, "mosip.optional-languages");

logger.info("optionalLanguages from env:" + optionalLanguages);

mandatoryLanguages = getValueFromActuators(propsKernel.getProperty("actuatorAdminEndpoint"),
section, "mosip.mandatoryLanguages from env:" + mandatoryLanguages);
section, "mosip.mandatory-languages");

logger.info("mandatoryLanguages from env:" + mandatoryLanguages);
}
catch(Exception e)
{
Expand Down Expand Up @@ -609,9 +613,9 @@ public static List<String> getSupportedIdTypesValueFromActuator() {
return supportedIdType;
}

String section = "configService:https://github.com/mosip/mosip-config/id-authentication-default.properties";
String section = "/mosip-config/id-authentication-default.properties";
if (!BaseTestCase.isTargetEnvLTS())
section = "configService:https://github.com/mosip/mosip-config/sandbox/id-authentication-lts.properties";
section = "/mosip-config/sandbox/id-authentication-lts.properties";

Response response = null;

Expand Down
43 changes: 43 additions & 0 deletions automationtests/src/main/resources/idRepository/AddIdentity/AddIdentity.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -41,6 +42,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -73,6 +75,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -105,6 +108,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
Expand Down Expand Up @@ -138,6 +142,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
Expand Down Expand Up @@ -171,6 +176,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -203,6 +209,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
Expand Down Expand Up @@ -236,6 +243,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -268,6 +276,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "@@GGHHDR",
Expand Down Expand Up @@ -305,6 +314,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -343,6 +353,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -380,6 +391,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -417,6 +429,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -455,6 +468,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -492,6 +506,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -529,6 +544,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -566,6 +582,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -603,6 +620,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -640,6 +658,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -676,6 +695,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -709,6 +729,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -746,6 +767,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -783,6 +805,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -819,6 +842,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -855,6 +879,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -888,6 +913,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -925,6 +951,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -962,6 +989,7 @@ AddIdentity:
"value": "dbfkxjf",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1000,6 +1028,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1037,6 +1066,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1074,6 +1104,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1111,6 +1142,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1148,6 +1180,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1185,6 +1218,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1222,6 +1256,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1255,6 +1290,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1288,6 +1324,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1321,6 +1358,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1354,6 +1392,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1387,6 +1426,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1420,6 +1460,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1453,6 +1494,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down Expand Up @@ -1486,6 +1528,7 @@ AddIdentity:
"value": "$BIOVALUE$",
"id": "mosip.id.create",
"registrationId": "$RID$",
"addressCopy": "Y",
"biometricReferenceId": "23452353",
"UIN": "$UIN$",
Expand Down
Loading

0 comments on commit 42779a1

Please sign in to comment.