diff options
Diffstat (limited to 'components/slice-analysis-ms/src/test')
3 files changed, 18 insertions, 11 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 d9bf7617..7ac92f29 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 @@ -93,10 +93,8 @@ public class PolicyServiceTest { try { output = obj.readValue(new String(Files.readAllBytes(Paths.get("src/test/resources/onsetMessage2.json"))), OnsetMessage.class); expected = obj.writeValueAsString(output); - - String msg = obj.writeValueAsString(policyService + actual = new Gson().toJson(policyService .formPolicyOnsetMessageForCCVPN(cllId, 3000, RequestOwner.UUI)); - actual = new Gson().toJson(msg); } catch (IOException e) { e.printStackTrace(); diff --git a/components/slice-analysis-ms/src/test/resources/config_all.json b/components/slice-analysis-ms/src/test/resources/config_all.json index b48ca753..c24c1f6f 100644 --- a/components/slice-analysis-ms/src/test/resources/config_all.json +++ b/components/slice-analysis-ms/src/test/resources/config_all.json @@ -5,7 +5,7 @@ "aaf_password": null, "type": "message-router", "dmaap_info": { - "topic_url": "https://message-router.onap.svc.cluster.local:3905/events/unauthenticated.VES_MEASUREMENT_OUTPUT", + "topic_url": "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.PERFORMANCE_MEASUREMENTS", "client_role": "sliceanalysis-subscriber", "location": "onap", "client_id": "sdnr-sliceanalysis-1" @@ -16,7 +16,18 @@ "aaf_password": null, "type": "message-router", "dmaap_info": { - "topic_url": "https://message-router.onap.svc.cluster.local:3905/events/DCAE_CL_RSP", + "topic_url": "http://message-router.onap.svc.cluster.local:3904/events/DCAE_CL_RSP", + "client_role": "sliceanalysis-subscriber", + "location": "onap", + "client_id": "sdnr-sliceanalysis-1" + }, + "aaf_username": null + }, + "intelligent_slicing_topic": { + "aaf_password": null, + "type": "message-router", + "dmaap_info": { + "topic_url": "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.ML_RESPONSE_TOPIC", "client_role": "sliceanalysis-subscriber", "location": "onap", "client_id": "sdnr-sliceanalysis-1" @@ -40,7 +51,7 @@ "aaf_password": null, "api_key" : null, "api_secret" : null, - "servers" : ["message-router:3904"], + "servers" : ["dmaap:3904"], "consumer_group" : "dcae_ccvpn_cl", "consumer_instance" : "dcae_ccvpn_cl_aaievent", "fetch_timeout" : 15000, @@ -58,7 +69,7 @@ "aaf_password": null, "type": "message-router", "dmaap_info": { - "topic_url": "https://message-router.onap.svc.cluster.local:3905/events/unauthenticated.DCAE_CL_OUTPUT", + "topic_url": "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT", "client_role": "sliceanalysis-subscriber", "location": "onap", "client_id": "sdnr-sliceanalysis-1" diff --git a/components/slice-analysis-ms/src/test/resources/onsetMessage2.json b/components/slice-analysis-ms/src/test/resources/onsetMessage2.json index dbcbda4c..eb64eff2 100644 --- a/components/slice-analysis-ms/src/test/resources/onsetMessage2.json +++ b/components/slice-analysis-ms/src/test/resources/onsetMessage2.json @@ -1,8 +1,6 @@ { "closedLoopControlName": "ControlLoop-CCVPN-CLL-227e8b00-dbeb-4d03-8719-d0a658fb846c", "closedLoopAlarmStart": 1605691996370, - "modelInvariantUuid": "6790ab0e-034f-11eb-adc1-0242ac120002", - "modelUuid": "6790ab0e-034f-11eb-adc1-0242ac120002", "closedLoopEventClient": "microservice.sliceAnalysisMS", "closedLoopEventStatus": "ONSET", "requestID": "1e946480-1232-46d4-a39b-614ac534400f", @@ -12,9 +10,9 @@ "version": "1.0.2", "target_type": "VNF", "AAI": { - "generic-vnf.is-closed-loop-disabled": "true", + "generic-vnf.is-closed-loop-disabled": "false", "generic-vnf.prov-status": "ACTIVE", - "generic-vnf.vnf-id": "3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82", + "generic-vnf.vnf-id": "e51a9b12-f313-11ea-adc1-0242ac120003", "generic-vnf.vnf-name": "76543" } } |