summaryrefslogtreecommitdiffstats
path: root/components/slice-analysis-ms/src/test
diff options
context:
space:
mode:
authorAhila <ahila.pandaram@wipro.com>2020-12-04 18:08:32 +0530
committerAhila <ahila.pandaram@wipro.com>2020-12-04 21:02:25 +0530
commitf6fe21b365fc6b89f79b01d6b08a2f75d7ea4dad (patch)
tree58e50c2da1a3ffd73ceede048eaa0a3d0a4cd4ee /components/slice-analysis-ms/src/test
parent4b2b1445bef3b760ed29efa1c7c78977dde73452 (diff)
Slice-analysis-ms and Policy integration issue fixes
Corrected the Test failure Issue-ID: DCAEGEN2-2540 Signed-off-by: Ahila <ahila.pandaram@wipro.com> Change-Id: I9a8515fc9ed3c8ce124ddd51815c27ccdeadb900
Diffstat (limited to 'components/slice-analysis-ms/src/test')
-rw-r--r--components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/PolicyServiceTest.java2
-rw-r--r--components/slice-analysis-ms/src/test/resources/onsetMessage.json37
2 files changed, 5 insertions, 34 deletions
diff --git a/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/PolicyServiceTest.java b/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/PolicyServiceTest.java
index 1131a5e5..fef9eb35 100644
--- a/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/PolicyServiceTest.java
+++ b/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/PolicyServiceTest.java
@@ -78,7 +78,7 @@ public class PolicyServiceTest {
actual = new Gson().toJson(policyService.formPolicyOnsetMessage(snssai,addProps,input));
assertThatJson(actual)
- .whenIgnoringPaths("requestID","payload.additionalProperties.nsiInfo.nsiId","closedLoopAlarmStart", "AAI", "target_type", "aai", "targetType")
+ .whenIgnoringPaths("requestID","payload","closedLoopAlarmStart", "AAI", "target_type", "aai", "targetType")
.isEqualTo(expected);
}
}
diff --git a/components/slice-analysis-ms/src/test/resources/onsetMessage.json b/components/slice-analysis-ms/src/test/resources/onsetMessage.json
index 7f91ad12..033e9b94 100644
--- a/components/slice-analysis-ms/src/test/resources/onsetMessage.json
+++ b/components/slice-analysis-ms/src/test/resources/onsetMessage.json
@@ -5,42 +5,13 @@
"closedLoopEventStatus": "ONSET",
"requestID": "c7c6a4aa-bb61-4a15-b831-ba1472dd4a65",
"target_type": "VNF",
- "target": "vserver.vserver-name",
+ "target": "generic-vnf.vnf-id",
"AAI": {
"vserver.is-closed-loop-disabled": "false",
"vserver.prov-status": "ACTIVE",
- "vserver.vserver-name": "e51a9b12-f313-11ea-adc1-0242ac120003"
+ "generic-vnf.vnf-id": "e51a9b12-f313-11ea-adc1-0242ac120003"
},
- "payload": {
- "name":"e51a9b12-f313-11ea-adc1-0242ac120003",
- "globalSubscriberId":"5GCustomer",
- "subscriptionServiceType":"5G",
- "networkType":"AN",
- "serviceInstanceID":"e51a9b12-f313-11ea-adc1-0242ac120003",
- "additionalProperties":{
- "modifyAction":"reconfigure",
- "snssaiList":[
- "001-100001"
- ],
- "sliceProfileId":"e51a9b12-f313-11ea-adc1-0242ac120002",
- "resourceConfig":{
- "1":{
- "dLThptPerSlice":50,
- "uLThptPerSlice":40
- },
- "2":{
- "dLThptPerSlice":50,
- "uLThptPerSlice":30
- }
- },
- "nsiInfo":{
- "nsiId":"UUID",
- "nsiName":""
- },
- "scriptName": "AN"
- }
-
-},
+ "payload": "{\"name\":\"e51a9b12-f313-11ea-adc1-0242ac120003\",\"globalSubscriberId\":\"5GCustomer\",\"subscriptionServiceType\":\"5G\",\"networkType\":\"AN\",\"serviceInstanceID\":\"e51a9b12-f313-11ea-adc1-0242ac120003\",\"additionalProperties\":{\"modifyAction\":\"reconfigure\",\"snssaiList\":[\"001-100001\"],\"sliceProfileId\":\"e51a9b12-f313-11ea-adc1-0242ac120002\",\"resourceConfig\":{\"1\":{\"dLThptPerSlice\":50,\"uLThptPerSlice\":40},\"2\":{\"dLThptPerSlice\":50,\"uLThptPerSlice\":30}},\"nsiInfo\":{\"nsiId\":\"UUID\",\"nsiName\":\"\"},\"scriptName\":\"AN\"}}",
"from": "DCAE",
"version": "1.0.2"
-} \ No newline at end of file
+}