From 575ecd5f490dee12ae652eaa5eaecd973c6986cc Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Tue, 29 Oct 2024 15:15:26 +0530 Subject: [PATCH 1/4] MOSIP-36205 Signed-off-by: Jayesh Kharode --- .../adminui/utility/EmailableReport.java | 2 +- .../testrig/adminui/utility/SetTestName.java | 9 ---- .../main/resources/config/Kernel.properties | 43 ++++++++++--------- 3 files changed, 23 insertions(+), 31 deletions(-) delete mode 100644 uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/SetTestName.java diff --git a/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java b/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java index ff185b2c..a5d2fd15 100644 --- a/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java +++ b/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java @@ -114,7 +114,7 @@ public void generateReport(List xmlSuites, List suites, String boolean isStoreSuccess = false; boolean isStoreSuccess2 = false; try { - isStoreSuccess = s3Adapter.putObject(ConfigManager.getS3Account(), BaseTestCaseFunc.testLevel, null, + isStoreSuccess = s3Adapter.putObject(ConfigManager.getS3Account(),"adminui", null, null, newString, newReportFile); logger.info("isStoreSuccess:: " + isStoreSuccess); diff --git a/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/SetTestName.java b/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/SetTestName.java deleted file mode 100644 index 8681aad4..00000000 --- a/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/SetTestName.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.mosip.testrig.adminui.utility; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) -public @interface SetTestName { - int idx() default 0; -} \ No newline at end of file diff --git a/uitest-admin/src/main/resources/config/Kernel.properties b/uitest-admin/src/main/resources/config/Kernel.properties index 2dbdeb09..ce4bed40 100644 --- a/uitest-admin/src/main/resources/config/Kernel.properties +++ b/uitest-admin/src/main/resources/config/Kernel.properties @@ -13,63 +13,63 @@ bulkUploadUrl=/v1/admin/bulkupload #IDREPO mosip_idrepo_app_id=idrepo mosip_idrepo_client_id=mosip-idrepo-client -mosip_idrepo_client_secret=M7CZ6WYMi6oe695u +mosip_idrepo_client_secret=hGZKxzkjqoN0f6H5 #IDREPO mosip_idrepo_app_id=idrepo mosip_idrepo_client_id=mosip-idrepo-client -mosip_idrepo_client_secret=M7CZ6WYMi6oe695u +mosip_idrepo_client_secret=hGZKxzkjqoN0f6H5 keycloak-realm-id=mosip -keycloak-external-url=https://iam.dev.mosip.net +keycloak-external-url=https://iam.dev-staging.mosip.net mosip_testrig_client_id=mosip-testrig-client -mosip_testrig_client_secret=mqKN6lkadcA3rG31 +mosip_testrig_client_secret=45Ix9Q7R33tT9lg7 admin mosip_admin_app_id=admin admin_password=mosip123 #actuall user login will be 'adminui-auto12' admin_userName=admin00 mosip_admin_client_id=mosip-admin-client -mosip_admin_client_secret=xzzvvPISDPwR2yl7 +mosip_admin_client_secret=zREmrDijMsQv1N4D #admin admin_zone_password=mosip123 admin_zone_userName=globaladmin mosip_regclient_app_id=registrationclient mosip_reg_client_id=mosip-reg-client -mosip_reg_client_secret=ExzIU4M7MYrMZLuz +mosip_reg_client_secret=GxnDNDOzbvcc3Gmc iam-users-to-create=admin00 #iam-users-to-create=111997,220005,111992 iam-users-password=mosip123 -roles.admin00=GLOBAL_ADMIN,ID_AUTHENTICATION,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN +roles=GLOBAL_ADMIN,ID_AUTHENTICATION,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN roles.globaladmin=GLOBAL_ADMIN,REGISTRATION_ADMIN,uma_authorization,ZONAL_ADMIN,default-roles-mosip -partner_url=jdbc:postgresql://dev.mosip.net:5432/mosip_ida +partner_url=jdbc:postgresql://api-internal.dev-staging.mosip.net:5432/mosip_ida #----------------------------------Database properties----------------------------------------------------------# postgresqlUser=postgresql db-port=5432 -db-server=dev.mosip.net +db-server=api-internal.dev-staging.mosip.net hibernate.connection.driver_class=org.postgresql.Driver hibernate.connection.pool_size=1 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect hibernate.show_sql=true hibernate.current_session_context_class=thread db-su-user=postgres -postgres-password=mQi298ZW7p +postgres-password=pEN4UNOnZh pms_db_schema=pms km_db_schema=keymgr master_db_schema=master audit_db_schema=audit ida_db_schema=ida -db-server=dev.mosip.net -keycloak-external-url=https://iam.dev.mosip.net -audit_url=jdbc:postgresql://dev.mosip.net:5432/mosip_audit +db-server=api-internal.dev-staging.mosip.net +keycloak-external-url=https://iam.dev-staging.mosip.net +audit_url=jdbc:postgresql://api-internal.dev-staging.mosip.net:5432/mosip_audit driver_class=org.postgresql.Driver pool_size=1 dialect=org.hibernate.dialect.PostgreSQLDialect show_sql=true current_session_context_class=thread db-su-user=postgres -postgres-password=mQi298ZW7p +postgre-password=pEN4UNOnZh postgresqlUser=postgresql db-port=5432 -db-server=dev.mosip.net +db-server=api-internal.dev-staging.mosip.net s3-user-key=minioadmin s3-user-secret=minioadmin s3-host=http://minio.minio:9000 @@ -104,12 +104,12 @@ validateBindingEndpoint=esignet-binding #To run locally authCertsPath= servicesNotDeployed= -adminPortalPath=https://admin.dev.mosip.net/ -apiEnvUser=api-internal.dev -apiInternalEndPoint=https://api-internal.dev.mosip.net +adminPortalPath=https://admin.dev-staging.mosip.net/ +apiEnvUser=api-internal.dev-staging +apiInternalEndPoint=https://api-internal.dev-staging.mosip.net #----------------------------------Test_data--------------------------------------------- -adminscenariosToExecute= +adminscenariosToExecute=holidaysCRUD holidayDateCenter=11/12/2026 holidayDate=10/12/2026 validityDate=10/12/2026 @@ -120,6 +120,7 @@ bulkwait=10000 dummyData=blocklistworddata publicKey=AAEACwACAHIAIINxl2dEhLP4GpDMjUal1yT9UtduBlILZPKh2hszFGmqABAAFwALCAAAAQABAQDFEX4nLppAuHIfGzhYn7DR_3wAQkVnrPSFFaiV9TAvN0WHtH_hweGNNjUGYvyaowwmC8jsazufmnIoPisZIFraVQNWCA6N0RhZF_LisoTYDoQSM-ZbCKPxRTFnemtTwXHxQdlVWGUXst_WZIWC0OTSzJHbBg_iXQW1UOXRJL845GFOKjvOPQiEbOZgmoWslkTIAi9bf-AeWdEYuO3bwPf-T5Xxj_xH2-PTinQA_4itRWSrhG5kEU-zQHWGL72SiGzwOOoPnzZZv2X_9djpWGEz1gyNl5ionns8IfuQrvikSEMxm-E6Z9RfKNhl_rEHgnOR4gl0ju5kg_n9tnuUeXXP signPublicKey=AAEABAAEAHIAAAAQABQACwgAAAEAAQEArjUwXvR8QvkWcplKOqMhU-tK4YxPHdkkm9IN7azBolMoAs41uR32xp070AW5LfhQokuEskOF_dvRrqHw4JzWMXDRVSpBrW_k-OwLzNfeFvuKQ9JTAXdzKUOXbPgcLY1B5bJe9E7fn-gPKYki35RgwphHraSKaYZ1yELpXiT3KPoWXzDvZE5Lqx317bgMGh2RPkf80alJks-iv-aEPDWlSWE5jr3t68gUYx4r_eixdw6tx1ADGCqK1ZEKCul73ptnR8eWorN1njcxlxUaoECvf3rCEuvfZAprBKSWBEnaFPkfgc9lYSBwtP4YKJHttmPX0Dzc85wa6V17SIwNVEiCsQ -headless=yes +headless=no docker=yes -langcode=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"hin"},{"language":"eng1","value":"English"},{"language":"eng","value":"English"},{"language":"fra","value":"Français"},{"language":"ara","value":"Arabic"}] +langcode=[{"language":"tam","value":"\u0BA4\u0BAE\u0BBF\u0BB4\u0BDCuFFFD"},{"language":"kan","value":"\u0C9Cu2022\u0CA8\u0CDCuFFFD\u0CA8\u0CA1"},{"language":"hin","value":"hin"},{"language":"eng1","value":"English"},{"language":"eng","value":"English"},{"language":"fra","value":"Français"},{"language":"ara","value":"Arabic"}] + \ No newline at end of file From f28701cffd5e340754f465c0a65f2ba8b5b1d08a Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Tue, 29 Oct 2024 15:34:33 +0530 Subject: [PATCH 2/4] MOSIP-36205 Signed-off-by: Jayesh Kharode --- uitest-admin/src/main/resources/config/Kernel.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uitest-admin/src/main/resources/config/Kernel.properties b/uitest-admin/src/main/resources/config/Kernel.properties index ce4bed40..1a1964ff 100644 --- a/uitest-admin/src/main/resources/config/Kernel.properties +++ b/uitest-admin/src/main/resources/config/Kernel.properties @@ -109,7 +109,7 @@ apiEnvUser=api-internal.dev-staging apiInternalEndPoint=https://api-internal.dev-staging.mosip.net #----------------------------------Test_data--------------------------------------------- -adminscenariosToExecute=holidaysCRUD +adminscenariosToExecute= holidayDateCenter=11/12/2026 holidayDate=10/12/2026 validityDate=10/12/2026 From dbd28ba5f6b9e2f90db85a176fbbee7a62813e40 Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Tue, 29 Oct 2024 15:38:24 +0530 Subject: [PATCH 3/4] MOSIP-36205 Signed-off-by: Jayesh Kharode --- .../mosip/testrig/adminui/utility/EmailableReport.java | 2 +- .../io/mosip/testrig/adminui/utility/SetTestName.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/SetTestName.java diff --git a/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java b/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java index a5d2fd15..191a1c3b 100644 --- a/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java +++ b/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java @@ -114,7 +114,7 @@ public void generateReport(List xmlSuites, List suites, String boolean isStoreSuccess = false; boolean isStoreSuccess2 = false; try { - isStoreSuccess = s3Adapter.putObject(ConfigManager.getS3Account(),"adminui", null, + isStoreSuccess = s3Adapter.putObject(ConfigManager.getS3Account(), "Adminui", null, null, newString, newReportFile); logger.info("isStoreSuccess:: " + isStoreSuccess); diff --git a/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/SetTestName.java b/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/SetTestName.java new file mode 100644 index 00000000..8681aad4 --- /dev/null +++ b/uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/SetTestName.java @@ -0,0 +1,9 @@ +package io.mosip.testrig.adminui.utility; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface SetTestName { + int idx() default 0; +} \ No newline at end of file From 253e8b30a22ca98640f2bedffb27dfd1bcba9288 Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Tue, 29 Oct 2024 15:58:58 +0530 Subject: [PATCH 4/4] MOSIP-36205 Signed-off-by: Jayesh Kharode --- .../main/resources/config/Kernel.properties | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/uitest-admin/src/main/resources/config/Kernel.properties b/uitest-admin/src/main/resources/config/Kernel.properties index 1a1964ff..2dbdeb09 100644 --- a/uitest-admin/src/main/resources/config/Kernel.properties +++ b/uitest-admin/src/main/resources/config/Kernel.properties @@ -13,63 +13,63 @@ bulkUploadUrl=/v1/admin/bulkupload #IDREPO mosip_idrepo_app_id=idrepo mosip_idrepo_client_id=mosip-idrepo-client -mosip_idrepo_client_secret=hGZKxzkjqoN0f6H5 +mosip_idrepo_client_secret=M7CZ6WYMi6oe695u #IDREPO mosip_idrepo_app_id=idrepo mosip_idrepo_client_id=mosip-idrepo-client -mosip_idrepo_client_secret=hGZKxzkjqoN0f6H5 +mosip_idrepo_client_secret=M7CZ6WYMi6oe695u keycloak-realm-id=mosip -keycloak-external-url=https://iam.dev-staging.mosip.net +keycloak-external-url=https://iam.dev.mosip.net mosip_testrig_client_id=mosip-testrig-client -mosip_testrig_client_secret=45Ix9Q7R33tT9lg7 +mosip_testrig_client_secret=mqKN6lkadcA3rG31 admin mosip_admin_app_id=admin admin_password=mosip123 #actuall user login will be 'adminui-auto12' admin_userName=admin00 mosip_admin_client_id=mosip-admin-client -mosip_admin_client_secret=zREmrDijMsQv1N4D +mosip_admin_client_secret=xzzvvPISDPwR2yl7 #admin admin_zone_password=mosip123 admin_zone_userName=globaladmin mosip_regclient_app_id=registrationclient mosip_reg_client_id=mosip-reg-client -mosip_reg_client_secret=GxnDNDOzbvcc3Gmc +mosip_reg_client_secret=ExzIU4M7MYrMZLuz iam-users-to-create=admin00 #iam-users-to-create=111997,220005,111992 iam-users-password=mosip123 -roles=GLOBAL_ADMIN,ID_AUTHENTICATION,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN +roles.admin00=GLOBAL_ADMIN,ID_AUTHENTICATION,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN roles.globaladmin=GLOBAL_ADMIN,REGISTRATION_ADMIN,uma_authorization,ZONAL_ADMIN,default-roles-mosip -partner_url=jdbc:postgresql://api-internal.dev-staging.mosip.net:5432/mosip_ida +partner_url=jdbc:postgresql://dev.mosip.net:5432/mosip_ida #----------------------------------Database properties----------------------------------------------------------# postgresqlUser=postgresql db-port=5432 -db-server=api-internal.dev-staging.mosip.net +db-server=dev.mosip.net hibernate.connection.driver_class=org.postgresql.Driver hibernate.connection.pool_size=1 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect hibernate.show_sql=true hibernate.current_session_context_class=thread db-su-user=postgres -postgres-password=pEN4UNOnZh +postgres-password=mQi298ZW7p pms_db_schema=pms km_db_schema=keymgr master_db_schema=master audit_db_schema=audit ida_db_schema=ida -db-server=api-internal.dev-staging.mosip.net -keycloak-external-url=https://iam.dev-staging.mosip.net -audit_url=jdbc:postgresql://api-internal.dev-staging.mosip.net:5432/mosip_audit +db-server=dev.mosip.net +keycloak-external-url=https://iam.dev.mosip.net +audit_url=jdbc:postgresql://dev.mosip.net:5432/mosip_audit driver_class=org.postgresql.Driver pool_size=1 dialect=org.hibernate.dialect.PostgreSQLDialect show_sql=true current_session_context_class=thread db-su-user=postgres -postgre-password=pEN4UNOnZh +postgres-password=mQi298ZW7p postgresqlUser=postgresql db-port=5432 -db-server=api-internal.dev-staging.mosip.net +db-server=dev.mosip.net s3-user-key=minioadmin s3-user-secret=minioadmin s3-host=http://minio.minio:9000 @@ -104,9 +104,9 @@ validateBindingEndpoint=esignet-binding #To run locally authCertsPath= servicesNotDeployed= -adminPortalPath=https://admin.dev-staging.mosip.net/ -apiEnvUser=api-internal.dev-staging -apiInternalEndPoint=https://api-internal.dev-staging.mosip.net +adminPortalPath=https://admin.dev.mosip.net/ +apiEnvUser=api-internal.dev +apiInternalEndPoint=https://api-internal.dev.mosip.net #----------------------------------Test_data--------------------------------------------- adminscenariosToExecute= @@ -120,7 +120,6 @@ bulkwait=10000 dummyData=blocklistworddata publicKey=AAEACwACAHIAIINxl2dEhLP4GpDMjUal1yT9UtduBlILZPKh2hszFGmqABAAFwALCAAAAQABAQDFEX4nLppAuHIfGzhYn7DR_3wAQkVnrPSFFaiV9TAvN0WHtH_hweGNNjUGYvyaowwmC8jsazufmnIoPisZIFraVQNWCA6N0RhZF_LisoTYDoQSM-ZbCKPxRTFnemtTwXHxQdlVWGUXst_WZIWC0OTSzJHbBg_iXQW1UOXRJL845GFOKjvOPQiEbOZgmoWslkTIAi9bf-AeWdEYuO3bwPf-T5Xxj_xH2-PTinQA_4itRWSrhG5kEU-zQHWGL72SiGzwOOoPnzZZv2X_9djpWGEz1gyNl5ionns8IfuQrvikSEMxm-E6Z9RfKNhl_rEHgnOR4gl0ju5kg_n9tnuUeXXP signPublicKey=AAEABAAEAHIAAAAQABQACwgAAAEAAQEArjUwXvR8QvkWcplKOqMhU-tK4YxPHdkkm9IN7azBolMoAs41uR32xp070AW5LfhQokuEskOF_dvRrqHw4JzWMXDRVSpBrW_k-OwLzNfeFvuKQ9JTAXdzKUOXbPgcLY1B5bJe9E7fn-gPKYki35RgwphHraSKaYZ1yELpXiT3KPoWXzDvZE5Lqx317bgMGh2RPkf80alJks-iv-aEPDWlSWE5jr3t68gUYx4r_eixdw6tx1ADGCqK1ZEKCul73ptnR8eWorN1njcxlxUaoECvf3rCEuvfZAprBKSWBEnaFPkfgc9lYSBwtP4YKJHttmPX0Dzc85wa6V17SIwNVEiCsQ -headless=no +headless=yes docker=yes -langcode=[{"language":"tam","value":"\u0BA4\u0BAE\u0BBF\u0BB4\u0BDCuFFFD"},{"language":"kan","value":"\u0C9Cu2022\u0CA8\u0CDCuFFFD\u0CA8\u0CA1"},{"language":"hin","value":"hin"},{"language":"eng1","value":"English"},{"language":"eng","value":"English"},{"language":"fra","value":"Français"},{"language":"ara","value":"Arabic"}] - \ No newline at end of file +langcode=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"hin"},{"language":"eng1","value":"English"},{"language":"eng","value":"English"},{"language":"fra","value":"Français"},{"language":"ara","value":"Arabic"}]