summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@bell.ca>2021-06-30 16:46:00 +0100
committera.sreekumar <ajith.sreekumar@bell.ca>2021-06-30 16:46:06 +0100
commitdf1a5bd938487aad49ccb112b679adba5a04cdac (patch)
tree842aa9f96008239e12125c5ca68a69f62b0cb84b
parent29ed0d71a625d62f2f86f1d39257089df4c75ddc (diff)
Fix related to name and statistics changes in CSIT
Change-Id: Iaeaadca083431a8b8df8043f73146fb31a09f3e0 Issue-ID: POLICY-3410 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
-rw-r--r--csit/apex-pdp/tests/apex-pdp-test.robot7
-rw-r--r--csit/config/pap/defaultConfig.json1
2 files changed, 5 insertions, 3 deletions
diff --git a/csit/apex-pdp/tests/apex-pdp-test.robot b/csit/apex-pdp/tests/apex-pdp-test.robot
index e538e6fa..62a01b94 100644
--- a/csit/apex-pdp/tests/apex-pdp-test.robot
+++ b/csit/apex-pdp/tests/apex-pdp-test.robot
@@ -16,6 +16,7 @@ Healthcheck
Log Received response from policy ${resp.text}
Should Be Equal As Strings ${resp.status_code} 200
Should Be Equal As Strings ${resp.json()['code']} 200
+ Set Suite Variable ${pdpName} ${resp.json()['name']}
ExecuteApexPolicy
Wait Until Keyword Succeeds 2 min 5 sec CreatePolicy
@@ -62,7 +63,7 @@ VerifyPolicyStatus
Should Be Equal As Strings ${resp.status_code} 200
Should Be Equal As Strings ${resp.json()[0]['pdpGroup']} defaultGroup
Should Be Equal As Strings ${resp.json()[0]['pdpType']} apex
- Should Be Equal As Strings ${resp.json()[0]['pdpId']} policy-apex-pdp
+ Should Be Equal As Strings ${resp.json()[0]['pdpId']} ${pdpName}
Should Be Equal As Strings ${resp.json()[0]['policy']['name']} onap.policies.native.apex.Sampledomain
Should Be Equal As Strings ${resp.json()[0]['policy']['version']} 1.0.0
Should Be Equal As Strings ${resp.json()[0]['policyType']['name']} onap.policies.native.Apex
@@ -85,10 +86,10 @@ VerifyPdpStatistics
Log Creating session https://${POLICY_PAP_IP}:6969
${session}= Create Session policy https://${POLICY_PAP_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
- ${resp}= GET On Session policy /policy/pap/v1/pdps/statistics/defaultGroup/apex/policy-apex-pdp params=recordCount=1 headers=${headers}
+ ${resp}= GET On Session policy /policy/pap/v1/pdps/statistics/defaultGroup/apex/${pdpName} params=recordCount=1 headers=${headers}
Log Received response from policy ${resp.text}
Should Be Equal As Strings ${resp.status_code} 200
- Should Be Equal As Strings ${resp.json()['defaultGroup']['apex'][0]['pdpInstanceId']} policy-apex-pdp
+ Should Be Equal As Strings ${resp.json()['defaultGroup']['apex'][0]['pdpInstanceId']} ${pdpName}
Should Be Equal As Strings ${resp.json()['defaultGroup']['apex'][0]['pdpGroupName']} defaultGroup
Should Be Equal As Strings ${resp.json()['defaultGroup']['apex'][0]['pdpSubGroupName']} apex
Should Be Equal As Strings ${resp.json()['defaultGroup']['apex'][0]['policyDeployCount']} ${deployCount}
diff --git a/csit/config/pap/defaultConfig.json b/csit/config/pap/defaultConfig.json
index 51a4c044..15bba3f4 100644
--- a/csit/config/pap/defaultConfig.json
+++ b/csit/config/pap/defaultConfig.json
@@ -28,6 +28,7 @@
"databasePassword": "policy_user",
"persistenceUnit": "PolicyMariaDb"
},
+ "savePdpStatisticsInDb": true,
"topicParameterGroup": {
"topicSources" : [{
"topic" : "POLICY-PDP-PAP",