aboutsummaryrefslogtreecommitdiffstats
path: root/plans/dcaegen2-services-pmsh
diff options
context:
space:
mode:
authoregernug <gerard.nugent@est.tech>2020-09-07 11:05:03 +0100
committerFiachra Corcoran <fiachra.corcoran@est.tech>2020-09-10 14:00:39 +0000
commitab47e4ec20150af344d183ed97b14cb54454c74c (patch)
tree89998a7d23d157d7041ccf08e02b3717135d2201 /plans/dcaegen2-services-pmsh
parent09148c800bf7ca61ac2f96e005511753d4237aa0 (diff)
Amend CSIT jobs for PMSH filter changes
Issue-ID: DCAEGEN2-2403 Signed-off-by: egernug <gerard.nugent@est.tech> Change-Id: I37234268ed475515f992b965870bf0843422a827
Diffstat (limited to 'plans/dcaegen2-services-pmsh')
-rw-r--r--plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json58
-rw-r--r--plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json10
2 files changed, 62 insertions, 6 deletions
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json b/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json
index 3b8c127e..5705e325 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json
@@ -1,7 +1,7 @@
[
{
"httpRequest": {
- "path": "/aai/v19/query.*"
+ "path": "/aai/v20/query.*"
},
"httpResponse": {
"statusCode": 200,
@@ -49,6 +49,8 @@
"serial-number": "6061ZW3",
"ipaddress-v6-oam": "2001:0db8:0:0:0:0:1428:57ab",
"resource-version": "1573053304574",
+ "model-invariant-id": "7129e420-d396-4efb-af02-6b83499b12f8",
+ "model-version-id": "77c1a3d9-422a-4f78-bd8f-f7a357685b25",
"nf-role": "gNB",
"orchestration-status": "Active"
}
@@ -57,5 +59,57 @@
}
}
}
- }
+ },
+ {
+ "httpRequest":{
+ "path":"/aai/v20/service-design-and-creation/models/model.*"
+ },
+ "httpResponse":{
+ "statusCode":200,
+ "headers":{
+ "content-type":[
+ "application/json"
+ ]
+ },
+ "body":{
+ "type":"JSON",
+ "json":{
+ "model-version-id":"6d25b637-8bca-47e2-af1a-61258424183d",
+ "model-name":"PNF102",
+ "model-version":"1.0",
+ "model-description":"sartgserg",
+ "sdnc-model-name":"pm_control",
+ "sdnc-model-version":"1.0.0",
+ "resource-version":"1598626661947",
+ "relationship-list":{
+ "relationship":[
+ {
+ "related-to":"model-element",
+ "relationship-label":"org.onap.relationships.inventory.IsA",
+ "related-link":"/aai/v20/service-design-and-creation/models/model/c1a44771-3aa8-4888-a4f4-be89d1caa0cb/model-vers/model-ver/7256a992-10a7-4ac8-8c2c-63c67e5c48c8/model-elements/model-element/fddc70fe-8343-48c1-af2e-b54f551a32ee/model-elements/model-element/7bff45b7-8254-44e5-b7ad-6e10dee6dfc3",
+ "relationship-data":[
+ {
+ "relationship-key":"model.model-invariant-id",
+ "relationship-value":"c1a44771-3aa8-4888-a4f4-be89d1caa0cb"
+ },
+ {
+ "relationship-key":"model-ver.model-version-id",
+ "relationship-value":"7256a992-10a7-4ac8-8c2c-63c67e5c48c8"
+ },
+ {
+ "relationship-key":"model-element.model-element-uuid",
+ "relationship-value":"fddc70fe-8343-48c1-af2e-b54f551a32ee"
+ },
+ {
+ "relationship-key":"model-element.model-element-uuid",
+ "relationship-value":"7bff45b7-8254-44e5-b7ad-6e10dee6dfc3"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+ }
+ }
]
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
index 16d6893a..8caf2001 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
@@ -20,13 +20,15 @@
"fileBasedGP": 15,
"fileLocation": "/pm/pm.xml",
"nfFilter": {
- "swVersions": [
- "1.0.0",
- "1.0.1"
- ],
"nfNames": [
"^pnf.*",
"^vnf.*"
+ ],
+ "modelInvariantUUIDs": [
+ "7129e420-d396-4efb-af02-6b83499b12f8"
+ ],
+ "modelVersionIDs": [
+
]
},
"measurementGroups": [