Merge remote-tracking branch 'upstream/develop' into develop

Sohandey · Oct 13, 2023 · 4dbe0d5 · 4dbe0d5
2 parents 1feb224 + 6b20967
commit 4dbe0d5
Show file tree

Hide file tree

Showing 19 changed files with 350 additions and 27 deletions.
diff --git a/automationtests/Dockerfile b/automationtests/Dockerfile
@@ -32,7 +32,7 @@ WORKDIR /home/${container_user}
 
 ENV work_dir=/home/${container_user}
 
-ADD ./target/ $work_dir
+ADD ./target/automationtests-*.jar $work_dir/automationtests.jar
 
 ADD entrypoint.sh $work_dir/entrypoint.sh
 
@@ -55,4 +55,4 @@ ENV ENV_USER=
 ENV ENV_ENDPOINT=
 ENV ENV_TESTLEVEL=smokeAndRegression
 
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["./entrypoint.sh"]
diff --git a/automationtests/src/main/resources/config/pmsDataDeleteQueries.txt b/automationtests/src/main/resources/config/pmsDataDeleteQueries.txt
@@ -18,7 +18,7 @@ delete from pms.partner where id in ('Tech-123','MOVP','DPP','MISP','MISP2','FTP
 delete from auth_policy where cr_by='partner-111997'
 delete from pms.auth_policy where name in('mosip policy','mosip policy2','mosip policy3','mosip data share policy','mosip data share policy2')
 delete from policy_group where cr_by='partner-111997'
-delete from pms.policy_group where name in ('mosip policy group','mosip policy role testing groupp','mosip policy group2','update_policy_group','mosip policy status testing groupp with policy')
+delete from pms.policy_group where name in ('mosip policy group','mosip policy role testing groupp','mosip policy group2','update_policy_group','mosip policy status testing groupp with policy','mosip policy group for req key For_Req_Key_deactivaed_Policy','mosip policy group for req key For Update')
 delete from pms.misp_license where cr_by='pm_testuser'
 delete from pms.misp_license where misp_id in ('MISP','MISP2')
 delete from pms.ftp_chip_detail where foundational_trust_provider_id='FTP'

diff --git a/automationtests/src/main/resources/masterdata/DeviceSpecSearch/DeviceSpecSearch.yml b/automationtests/src/main/resources/masterdata/DeviceSpecSearch/DeviceSpecSearch.yml
@@ -306,9 +306,9 @@ DeviceSpecSearch:
   "id": "$IGNORE$",
   "name": "Webcam",
   "brand": "Logitech",
-  "model": "C270",
+  "model": "$IGNORE$",
   "deviceTypeCode": "CMR",
-  "minDriverversion": "2.086",
+  "minDriverversion": "$IGNORE$",
   "description": "$IGNORE$",
   "langCode": "$IGNORE$",
   "isActive": "$IGNORE$",

diff --git a/...tiontests/src/main/resources/masterdata/DeviceSpecification/CreateDeviceSpecification.yml b/...tiontests/src/main/resources/masterdata/DeviceSpecification/CreateDeviceSpecification.yml
@@ -45,7 +45,7 @@ CreateDeviceSpecification:
       output: '{
      "errors": [
     {
-      "errorCode": "KER-MSD-999"
+      "errorCode": "KER-MSD-054"
     }
   ]
       }'

diff --git a/automationtests/src/main/resources/masterdata/GetMachineHistory/GetMachineHistory.yml b/automationtests/src/main/resources/masterdata/GetMachineHistory/GetMachineHistory.yml
@@ -2,6 +2,7 @@ GetMachineHistory:
    Admin_GetMachineHistory_allValid_smoke:
       endPoint: /v1/masterdata/machineshistories/{id}/{langcode}/{effdatetimes}
       role: admin
+      checkErrorsOnlyInResponse: true
       restMethod: get
       inputTemplate: masterdata/GetMachineHistory/getMachineHistory
       outputTemplate: masterdata/GetMachineHistory/getMachineHistoryResult
@@ -79,7 +80,7 @@ GetMachineHistory:
       output: '{
    "errors": [
     {
-      "errorCode": "$IGNORE$",
+      "errorCode": "KER-MSD-032",
       "message": "$IGNORE$"
     }
   ]

diff --git a/automationtests/src/main/resources/masterdata/LocationData/CreateLocationData.yml b/automationtests/src/main/resources/masterdata/LocationData/CreateLocationData.yml
@@ -9,7 +9,7 @@ CreateLocationData:
       input: '{
     "code": "TST12",
     "name": "Test_Loc_A_",
-    "hierarchyLevel": "0",
+    "hierarchyLevel": "$HIERARCHYLEVEL$",
     "hierarchyName": "$HIERARCHYNAME$",
     "parentLocCode": "$PARENTLOCCODE$",
     "langCode": "eng",
@@ -35,7 +35,7 @@ CreateLocationData:
       input: '{
     "code": "",
     "name": "Test_Loc_1_A",
-    "hierarchyLevel":"4",
+    "hierarchyLevel":"$HIERARCHYLEVEL$",
     "hierarchyName":"$HIERARCHYNAME$",
     "parentLocCode":"$PARENTLOCCODE$",    
     "langCode": "eng",
@@ -60,7 +60,7 @@ CreateLocationData:
       input: '{
     "code": "NST",
     "name": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy",
-    "hierarchyLevel":"4",
+    "hierarchyLevel":"$HIERARCHYLEVEL$",
     "hierarchyName":"$HIERARCHYNAME$",
     "parentLocCode":"$PARENTLOCCODE$",    
     "langCode": "eng",
@@ -85,7 +85,7 @@ CreateLocationData:
       input: '{
     "code": "NST",
     "name": "",
-    "hierarchyLevel":"4",
+    "hierarchyLevel":"$HIERARCHYLEVEL$",
     "hierarchyName":"$HIERARCHYNAME$",
     "parentLocCode":"$PARENTLOCCODE$",    
     "langCode": "eng",
@@ -135,7 +135,7 @@ CreateLocationData:
       input: '{
     "code": "NST",
     "name": "NDATA",
-    "hierarchyLevel":"11",
+    "hierarchyLevel":"$HIERARCHYLEVEL$",
     "hierarchyName":"$HIERARCHYNAME$",
     "parentLocCode":"$PARENTLOCCODE$",    
     "langCode": "eng",
@@ -160,7 +160,7 @@ CreateLocationData:
       input: '{
     "code": "NST",
     "name": "NDATA",
-    "hierarchyLevel":"3",
+    "hierarchyLevel":"$HIERARCHYLEVEL$",
     "hierarchyName":"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklm",
     "parentLocCode":"$PARENTLOCCODE$",    
     "langCode": "eng",
@@ -185,7 +185,7 @@ CreateLocationData:
       input: '{
     "code": "NST",
     "name": "NDATA",
-    "hierarchyLevel":"3",
+    "hierarchyLevel":"$HIERARCHYLEVEL$",
     "hierarchyName":"",
     "parentLocCode":"$PARENTLOCCODE$",    
     "langCode": "eng",
@@ -210,7 +210,7 @@ CreateLocationData:
       input: '{
     "code": "NST",
     "name": "NDATA",
-    "hierarchyLevel":"4",
+    "hierarchyLevel":"$HIERARCHYLEVEL$",
     "hierarchyName":"$HIERARCHYNAME$",
     "parentLocCode":"fbheafg",    
     "langCode": "eng",
@@ -237,7 +237,7 @@ CreateLocationData:
       input: '{
     "code": "NST",
     "name": "NDATA",
-    "hierarchyLevel":"3",
+    "hierarchyLevel":"$HIERARCHYLEVEL$",
     "hierarchyName":"$HIERARCHYNAME$",
     "parentLocCode":"$PARENTLOCCODE$",    
     "langCode": "eng",

diff --git a/automationtests/src/main/resources/masterdata/SearchDocCategories/SearchDocCategories.yml b/automationtests/src/main/resources/masterdata/SearchDocCategories/SearchDocCategories.yml
@@ -80,6 +80,7 @@ SearchDocCategories:
       role: admin
       templateFields: ["languageCode"]
       restMethod: post
+      checkErrorsOnlyInResponse: true
       inputTemplate: masterdata/SearchDocCategories/searchDocCategories
       outputTemplate: masterdata/SearchDocCategories/searchDocCategoriesResult
       input: '{
@@ -108,7 +109,7 @@ SearchDocCategories:
      {
         "isActive": "$IGNORE$",
         "description": "$IGNORE$",
-        "code": "POA",
+        "code": "$IGNORE$",
         "langCode": "$IGNORE$",
         "name": "$IGNORE$"
       }

diff --git a/automationtests/src/main/resources/masterdata/SearchMachineSpec/SearchMachineSpec.yml b/automationtests/src/main/resources/masterdata/SearchMachineSpec/SearchMachineSpec.yml
@@ -144,12 +144,12 @@ SearchMachineSpec:
       output: '{
 	"data": [{
 	"id": "$IGNORE$",
-	"name": "HP",
+	"name": "$IGNORE$",
 	"brand": "HP",
-	"model": "1234",
+	"model": "$IGNORE$",
 	"machineTypeCode": "$IGNORE$",
-	"minDriverversion": "3.2",
-	"description": "HP brand",
+	"minDriverversion": "$IGNORE$",
+	"description": "$IGNORE$",
 	"isActive": "$IGNORE$"
 	}]
 }'

diff --git a/...ntests/src/main/resources/partner/ActivateDeactivatePartner/ActivateDeactivatePartner.yml b/...ntests/src/main/resources/partner/ActivateDeactivatePartner/ActivateDeactivatePartner.yml
@@ -29,10 +29,26 @@ ActivateDeactivatePartner:
       output: '{
 }'
 
+   Partner_ActivateDeactivatePartner_deactivate_Tech-1233:
+      endPoint: /v1/partnermanager/partners/{partnerId}
+      role: partner
+      checkErrorsOnlyInResponse: true
+      restMethod: patch
+      inputTemplate: partner/ActivateDeactivatePartner/activateDeactivatePartner
+      outputTemplate: partner/ActivateDeactivatePartner/activateDeactivatePartnerResult
+      input: '{
+   "partnerId": "Tech-1233",
+   "requesttime": "$TIMESTAMP$",
+   "status": "De-Active"
+}'
+      output: '{
+}'
+
 
    Partner_ActivateDeactivatePartner_deactivate_Tech_321:
       endPoint: /v1/partnermanager/partners/{partnerId}
       role: partner
+      checkErrorsOnlyInResponse: true
       restMethod: patch
       inputTemplate: partner/ActivateDeactivatePartner/activateDeactivatePartner
       outputTemplate: partner/ActivateDeactivatePartner/activateDeactivatePartnerResult

diff --git a/...ain/resources/partner/ActivateDeactivatePartnerApiKey/ActivateDeactivatePartnerApiKey.yml b/...ain/resources/partner/ActivateDeactivatePartnerApiKey/ActivateDeactivatePartnerApiKey.yml
@@ -14,6 +14,29 @@ ActivateDeactivatePartnerApiKey:
    "status": "De-Active"
 }'
       output: '{
+}'
+
+   Partner_ActivateDeactivatePartnerApiKey_deactivate_InValid_APIKey_Neg:
+      endPoint: /v1/partnermanager/partners/{partnerId}/policy/{policyId}/apiKey/status
+      role: partner
+      checkErrorsOnlyInResponse: true
+      restMethod: patch
+      inputTemplate: partner/ActivateDeactivatePartnerApiKey/activateDeactivatePartnerApiKey
+      outputTemplate: partner/ActivateDeactivatePartnerApiKey/activateDeactivatePartnerApiKeyResult
+      input: '{
+   "partnerId": "Tech-1233",
+   "policyId": "policyid",
+   "label": "string",
+   "requesttime": "$TIMESTAMP$",
+   "status": "De-Active"
+}'
+      output: '{
+      "errors": [
+    {
+      "errorCode": "PMS_PRT_111"
+    }
+  ]
+      
 }'
    Partner_ActivateDeactivatePartnerApiKey_activate_allValid_smoke:
       endPoint: /v1/partnermanager/partners/{partnerId}/policy/{policyId}/apiKey/status

diff --git a/automationtests/src/main/resources/partner/authPartner/CreatePartner/CreatePartner.yml b/automationtests/src/main/resources/partner/authPartner/CreatePartner/CreatePartner.yml
@@ -20,6 +20,48 @@ createPartnerSelfRegistration:
         "status": "InProgress"
     }'
 
+   Partner_PartnerSelfRegistration_Deactive_Partner_sid:
+      endPoint: /v1/partnermanager/partners
+      role: partner
+      restMethod: post
+      inputTemplate: partner/authPartner/CreatePartner/createPartner
+      outputTemplate: partner/authPartner/CreatePartner/createPartnerResult
+      input: '{
+    "address": "Bangalore",
+    "contactNumber": "8553967572",
+    "emailId": "[email protected]",
+    "organizationName": "Techno",
+    "partnerId": "Tech-321",
+    "partnerType": "Auth_Partner",
+    "policyGroup": "mosip policy group for req key For_Req_Key_deactivaed_Policy",
+	"requesttime": "$TIMESTAMP$"
+  }'
+      output: ' {
+        "partnerId": "Tech-321",
+        "status": "InProgress"
+    }'
+
+   Partner_PartnerSelfRegistration_All_for_Get_ApiKey_With_Deactive_Partner_sid:
+      endPoint: /v1/partnermanager/partners
+      role: partner
+      restMethod: post
+      inputTemplate: partner/authPartner/CreatePartner/createPartner
+      outputTemplate: partner/authPartner/CreatePartner/createPartnerResult
+      input: '{
+    "address": "Bangalore",
+    "contactNumber": "8553967572",
+    "emailId": "[email protected]",
+    "organizationName": "Techno",
+    "partnerId": "Tech-1233",
+    "partnerType": "Auth_Partner",
+    "policyGroup": "mosip policy group for req key For_Req_Key_deactivaed_Policy",
+	"requesttime": "$TIMESTAMP$"
+  }'
+      output: ' {
+        "partnerId": "Tech-1233",
+        "status": "InProgress"
+    }'
+
    Partner_PartnerSelfRegistration_AlreadyExisting_Policy_Name:
       endPoint: /v1/partnermanager/partners
       role: partner

diff --git a/automationtests/src/main/resources/partner/authPartner/RequestAPIKey/RequestAPIKey.yml b/automationtests/src/main/resources/partner/authPartner/RequestAPIKey/RequestAPIKey.yml
@@ -28,6 +28,26 @@ RequestAPIKeyForAuthPartner:
       output: '{
     }'
 
+   Partner_SubmitPartnerApiKeyRequest_Approval_All_for_Deactivated_policy:
+      endPoint: /v1/partnermanager/partners/Tech-1233/policy/map
+      role: partner
+      checkErrorsOnlyInResponse: true
+      restMethod: post 
+      inputTemplate: partner/authPartner/RequestAPIKey/requestApiKey
+      outputTemplate: partner/authPartner/RequestAPIKey/requestAPIKeyResult
+      input: '{
+        "policyName": "mosip policy group for req key For_Req_Key_deactivaed_Policy",
+        "useCaseDescription": "Need to submit the payment",
+		"requesttime": "$TIMESTAMP$"
+    }'
+      output: '{
+      "errors": [
+    {
+      "errorCode": "PMS_PMP_016"
+    }
+  ]
+    }'
+
    Partner_SubmitPartnerApiKeyRequest_Map_partner_partner_inprogress_state_Neg:
       endPoint: /v1/partnermanager/partners/Tech-123/policy/map
       role: partner

diff --git a/automationtests/src/main/resources/partner/authPartner/UploadCert/UploadCert.yml b/automationtests/src/main/resources/partner/authPartner/UploadCert/UploadCert.yml
@@ -31,6 +31,23 @@ uploadPartnerCert:
         }
     ]
 }'
+
+   Partner_UploadPartnerCert_invalid_Domain:
+      endPoint: /v1/partnermanager/partners/certificate/upload
+      role: partner
+      restMethod: post
+      inputTemplate: partner/authPartner/UploadCert/uploadCert4
+      outputTemplate: partner/error
+      input: '{  
+  "requesttime": "$TIMESTAMP$"
+}'
+      output: ' {
+  "errors": [
+        {
+            "errorCode": "KER-KMS-013"
+        }
+    ]
+}' 
    Partner_UploadPartnerCert_All_Valid_Smoke:
       endPoint: /v1/partnermanager/partners/certificate/upload
       role: partner

diff --git a/automationtests/src/main/resources/partner/authPartner/UploadCert/uploadCert4.hbs b/automationtests/src/main/resources/partner/authPartner/UploadCert/uploadCert4.hbs
@@ -0,0 +1,11 @@
+{
+  "id": "string",
+  "metadata": {},
+  "request": {
+    "certificateData": "-----BEGIN CERTIFICATE-----\nMIIDdzCCAl+gAwIBAgIUEadCfDU4u+euv+QKtQczPkzx8ZgwDQYJKoZIhvcNAQEL\nBQAwYTELMAkGA1UEBhMCSU4xEjAQBgNVBAgMCUthcmFudGFrYTESMBAGA1UEBwwJ\nQmFuZ2Fsb3JlMRIwEAYDVQQKDAlNT1NJUFRFU1QxFjAUBgNVBAMMDW1vc2lwdGVz\ndC5vcmcwIBcNMjExMDI4MDk0OTA1WhgPMjEyMTEwMDUwOTQ5MDVaMFcxCzAJBgNV\nBAYTAklOMRIwEAYDVQQIDAlLYXJuYXRha2ExEjAQBgNVBAcMCUJhbmdhbG9yZTEP\nMA0GA1UECgwGVGVjaG5vMQ8wDQYDVQQDDAZUZWNobm8wggEiMA0GCSqGSIb3DQEB\nAQUAA4IBDwAwggEKAoIBAQDRKADJoldahY8x77a7GLMdZ/XXajChZA94csISXMgP\nhJnkOHnE0NvnzTraKfEXqA9Y3D4JDTODJTmd5hbeNjp1boXo3wZnzocb5gK6vA3p\n1kdlxSu7Ys0ZN5brH74bDCfr0BSeEX6TeJ3x+R3OAdiCM2taIQgaG2e7yRGbLosN\nHfV3WM3B76+N+GI8YKXia995Hsk/8zh2t5nXDXcga6zGhvdiN5goC/7Uq+RW60Fy\nNpEPdwXL4dydSbZsc857KLZ0Vz7ODdq1YnX23nElNVRo8q8UviUOvn8/Co7HVjWP\nGmwYw7aNnDBVzz62/1bxQrbMrI8RwMEI+DtKMS3C3bgnAgMBAAGjLzAtMAwGA1Ud\nEwEB/wQCMAAwHQYDVR0OBBYEFBKtNK93IR2yJJU8WrtNVY1fHdTRMA0GCSqGSIb3\nDQEBCwUAA4IBAQC2f5GdcPo/XQtXabAKcmGkt8xnKulIlsjCo69KiFzPgrhbeRIn\nGk4FkGAwFcYlhgUhgxfkoiQ6E0nNtgNosdug6P2fDFnAJa0usuy39TSKTdOF8BXn\npCsrwzApbhdUYvqXrunrsMlZx0JnCpChwjlQe6XdnaXCQVVlbcMrsl8hIP4kgm+w\nDJ6FdxqZhy5Y4vGJQTGp2cr2ZFICJFvYNavlh8d7yK9Eb4RpEh+qkXouHrPeQ2uj\nX4kB7HtY3mLthg/1erI3sUAJuTEs2cl3kVsO8QZZOGL5hvuo8dosbX6jwwxAmPZY\n5eEk1ZQBPuQ7MzRgxDHeM+xXamIahRqsFmAT\n-----END CERTIFICATE-----\n",
+    "partnerDomain": "dht",
+    "partnerId": "Tech-123"
+  },
+  "requesttime": "{{requesttime}}",
+  "version": "string"
+}