aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2021-03-11 08:33:44 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-11 08:33:44 +0000
commit1d3ceea1defb5640e9f850dad647904b41002988 (patch)
tree54c7ad8638c8a470a3e5e6d58f8432ac19f99d2b
parentfdb26eb9a3263b3ad5c85a8aa73310032115e2ce (diff)
parent3ebc72a6e8cde2f2b3b5ae651829ed6f5591e4df (diff)
Merge "Fix CSIT for PMSH"
-rw-r--r--plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json5
-rw-r--r--tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json4
2 files changed, 6 insertions, 3 deletions
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 5b6e6fea..5bb2e6f0 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
@@ -24,11 +24,14 @@
"^pnf.*",
"^vnf.*"
],
- "modelInvariantUUIDs": [
+ "modelInvariantIDs": [
"7129e420-d396-4efb-af02-6b83499b12f8"
],
"modelVersionIDs": [
+ ],
+ "modelNames": [
+
]
},
"measurementGroups": [
diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
index 1e692d31..f22d456a 100644
--- a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
+++ b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
@@ -24,14 +24,14 @@
"^pnf.*",
"^vnf.*"
],
- "modelInvariantUUIDs": [
+ "modelInvariantIDs": [
"7129e420-d396-4efb-af02-6b83499b12f8"
],
"modelVersionIDs": [
],
"modelNames": [
- "pnf102"
+
]
},
"measurementGroups": [