Merge "[CSIT] PMSH Supporting New Monitoring Policy Key Update"
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Tue, 4 May 2021 12:04:15 +0000 (12:04 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 4 May 2021 12:04:15 +0000 (12:04 +0000)
19 files changed:
plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks [deleted file]
plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass [deleted file]
plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml
plans/multicloud-fcaps/functionality1/setup.sh
tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot
tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json
tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/dcae-unsupported-namespace-request.json [new file with mode: 0644]
tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/xnf-unsupported-namespace-request.json [new file with mode: 0644]
tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/dcae-stnd-defined-payload-request.json [new file with mode: 0644]
tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/xnf-stnd-defined-payload-request.json [new file with mode: 0644]
tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_ml_response.json [deleted file]
tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm.json [deleted file]
tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm1.json [deleted file]
tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm2.json [deleted file]
tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm3.json [deleted file]
tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot

index b084b57..7593801 100644 (file)
@@ -64,6 +64,9 @@
     "sliceanalysisms.pollingTimeout": 60,
     "sliceanalysisms.cid": "sliceanalysisms-cid",
     "sliceanalysisms.configDb.service": "http://configdb_sim:5000",
+    "sliceanalysisms.aai.url": "http://configdb_sim:5000/aai/v21",
+    "sliceanalysisms.cps.url": "http://configdb_sim:5000",
+    "sliceanalysisms.configDbEnabled": "true",
     "service_calls": {
       "policy-req": []
     },
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks
deleted file mode 100644 (file)
index 33d9c56..0000000
Binary files a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks and /dev/null differ
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass
deleted file mode 100644 (file)
index 86edc20..0000000
+++ /dev/null
@@ -1 +0,0 @@
-YPHcOFZP}sptD;*RV8N!46rG
\ No newline at end of file
index cac148c..e593b4d 100644 (file)
@@ -87,9 +87,6 @@ services:
      - "8080:8080"
     volumes:
      - ./config/sliceanalysisms/config_all.json:/etc/config_all.json
-     - ./config/sliceanalysisms/trust12.jks:/opt/app/sliceanalysisms/etc/cert/trust.jks
-     - ./config/sliceanalysisms/trust.pass:/opt/app/sliceanalysisms/etc/cert/trust.pass
-    # - ./config/sliceanalysisms/trust.jks:/opt/app/sliceanalysisms/etc/cert/trustjss.jks
     depends_on:
      - postgres
     networks:
index 328329f..3161322 100644 (file)
@@ -16,7 +16,7 @@
 # Start all process required for executing test case
 
 source ${SCRIPTS}/common_functions.sh
-MULTICLOUD_DOCKER_VERSION=1.4.1
+MULTICLOUD_DOCKER_VERSION=1.5.6
 # start multicloud-fcaps
 docker run -d --name multicloud-fcaps nexus3.onap.org:10001/onap/multicloud/openstack-fcaps:$MULTICLOUD_DOCKER_VERSION
 SERVICE_IP=`get-instance-ip.sh multicloud-fcaps`
index 92b65cd..df47b86 100644 (file)
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018-2019 NOKIA
+# Copyright (C) 2018-2021 NOKIA
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,9 +39,11 @@ Configure collector
 
 Configure Dcae App
     Wait until keyword succeeds   10 sec   5 sec
-    ...    Configure Dcae App Simulator To Consume Messages From Topics   ${DEFAULT_PERF3GPP_TOPIC},${SECOND_PERF3GPP_TOPIC}
+    ...    Configure Dcae App Simulator To Consume Messages From Topics
+    ...    ${DEFAULT_PERF3GPP_TOPIC},${SECOND_PERF3GPP_TOPIC},${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}
     Set Suite Variable   ${DEFAULT_PERF3GPP_TOPIC}   children=True
     Set Suite Variable   ${SECOND_PERF3GPP_TOPIC}    children=True
+    Set Suite Variable   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}    children=True
 
 
 *** Variables ***
@@ -53,6 +55,7 @@ ${CONSUL_HV_VES_CONFIGURATION_KEY_PATH}        /v1/kv/dcae-hv-ves-collector
 
 ${DEFAULT_PERF3GPP_TOPIC}                      TEST_HV_VES_PERF3GPP
 ${SECOND_PERF3GPP_TOPIC}                       TEST_HV_VES_PERF3GPP_BUT_WITH_EXTRA_WORDS
+${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}    TEST_SEC_3GPP_HEARTBEAT_OUTPUT
 
 ${HV_VES_RESOURCES}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources
 ${HV_VES_CONFIGURATION_JSON_FILEPATH}          ${HV_VES_RESOURCES}/hv-ves-configuration.json
index 9898a96..c056604 100644 (file)
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018-2019 NOKIA
+# Copyright (C) 2018-2021 NOKIA
 # Modification copyright (C) 2021 Samsung Electronics Co., Ltd.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,6 +46,15 @@ Correct Messages Routing
     ...    Assert Dcae App Consumed   ${DEFAULT_PERF3GPP_TOPIC}   ${AMOUNT_25000}
     Assert Dcae App Consumed Proper Messages   ${DEFAULT_PERF3GPP_TOPIC}   ${DCAE_FIXED_PAYLOAD_REQUEST}
 
+Correct StndDefined Messages Routing
+    [Documentation]   VES-HV Collector should route all valid messages to stndDefined topics specified in configuration
+    ...               without changing message payload generated in xNF simulator
+
+    Send Messages From xNF Simulators   ${XNF_SIMULATOR}    ${XNF_STNDDEFINED_PAYLOAD_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}   ${AMOUNT_25000}
+    Assert Dcae App Consumed Proper Messages   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}   ${DCAE_STNDDEFINED_PAYLOAD_REQUEST}
 
 Too big payload message handling
     [Documentation]   VES-HV Collector should interrupt the stream when a message with too big payload is encountered
@@ -86,6 +95,15 @@ Unsupported domain message handling
     ...    Assert Dcae App Consumed  ${DEFAULT_PERF3GPP_TOPIC}   ${AMOUNT_50000}
     Assert Dcae App Consumed Proper Messages   ${DEFAULT_PERF3GPP_TOPIC}   ${DCAE_UNSUPPORTED_DOMAIN_REQUEST}
 
+Unsupported stndDefinedNamespace message handling
+    [Documentation]   VES-HV Collector should skip messages with unsupported domain
+
+    Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_UNSUPPORTED_NAMESPACE_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed  ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}   ${AMOUNT_50000}
+    Assert Dcae App Consumed Proper Messages   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}   ${DCAE_UNSUPPORTED_NAMESPACE_REQUEST}
+
 *** Variables ***
 ${HTTP_METHOD_URL}                             http://
 
@@ -93,16 +111,20 @@ ${XNF_SIM_API_PATH}                            /simulator/async
 
 ${HV_VES_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
 ${XNF_FIXED_PAYLOAD_REQUEST}                   ${HV_VES_SCENARIOS}/fixed-payload/xnf-fixed-payload-request.json
+${XNF_STNDDEFINED_PAYLOAD_REQUEST}             ${HV_VES_SCENARIOS}/stnd-defined/valid/xnf-stnd-defined-payload-request.json
 ${XNF_TOO_BIG_PAYLOAD_REQUEST}                 ${HV_VES_SCENARIOS}/too-big-payload/xnf-too-big-payload-request.json
 ${XNF_INVALID_WIRE_FRAME_REQUEST}              ${HV_VES_SCENARIOS}/invalid-wire-frame/xnf-invalid-wire-frame-request.json
 ${XNF_INVALID_GPB_DATA_REQUEST}                ${HV_VES_SCENARIOS}/invalid-gpb-data/xnf-invalid-gpb-data-request.json
 ${XNF_UNSUPPORTED_DOMAIN_REQUEST}              ${HV_VES_SCENARIOS}/unsupported-domain/xnf-unsupported-domain-request.json
+${XNF_UNSUPPORTED_NAMESPACE_REQUEST}           ${HV_VES_SCENARIOS}/stnd-defined/unsupported-namespace/xnf-unsupported-namespace-request.json
 
 ${DCAE_FIXED_PAYLOAD_REQUEST}                  ${HV_VES_SCENARIOS}/fixed-payload/dcae-fixed-payload-request.json
+${DCAE_STNDDEFINED_PAYLOAD_REQUEST}            ${HV_VES_SCENARIOS}/stnd-defined/valid/dcae-stnd-defined-payload-request.json
 ${DCAE_TOO_BIG_PAYLOAD_REQUEST}                ${HV_VES_SCENARIOS}/too-big-payload/dcae-too-big-payload-request.json
 ${DCAE_INVALID_WIRE_FRAME_REQUEST}             ${HV_VES_SCENARIOS}/invalid-wire-frame/dcae-invalid-wire-frame-request.json
 ${DCAE_INVALID_GPB_DATA_REQUEST}               ${HV_VES_SCENARIOS}/invalid-gpb-data/dcae-invalid-gpb-data-request.json
 ${DCAE_UNSUPPORTED_DOMAIN_REQUEST}             ${HV_VES_SCENARIOS}/unsupported-domain/dcae-unsupported-domain-request.json
+${DCAE_UNSUPPORTED_NAMESPACE_REQUEST}          ${HV_VES_SCENARIOS}/stnd-defined/unsupported-namespace/dcae-unsupported-namespace-request.json
 
 ${AMOUNT_25000}                                25000
 ${AMOUNT_50000}                                50000
index bab8a90..b943935 100644 (file)
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018-2019 NOKIA
+# Copyright (C) 2018-2021 NOKIA
 # Modification copyright (C) 2021 Samsung Electronics Co., Ltd.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -63,6 +63,7 @@ Send Messages From xNF Simulators
 VES-HV Collector Test Shutdown
     Reset DCAE App Simulator  ${DEFAULT_PERF3GPP_TOPIC}
     Reset DCAE App Simulator  ${SECOND_PERF3GPP_TOPIC}
+    Reset DCAE App Simulator  ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}
 
 
 VES-HV Collector Suite Teardown
index d932b7d..019e468 100644 (file)
         "bootstrap_servers": "kafka:9092",
         "topic_name": "TEST_HV_VES_PERF3GPP"
       }
+    },
+    "ves-3gpp-heartbeat": {
+      "type": "kafka",
+      "aaf_credentials": {
+        "username": "admin",
+        "password": "admin_secret"
+      },
+      "kafka_info": {
+        "bootstrap_servers": "kafka:9092",
+        "topic_name": "TEST_SEC_3GPP_HEARTBEAT_OUTPUT"
+      }
     }
   }
 }
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/dcae-unsupported-namespace-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/dcae-unsupported-namespace-request.json
new file mode 100644 (file)
index 0000000..1e75e48
--- /dev/null
@@ -0,0 +1,25 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 50000
+  }
+]
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/xnf-unsupported-namespace-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/xnf-unsupported-namespace-request.json
new file mode 100644 (file)
index 0000000..02c0e84
--- /dev/null
@@ -0,0 +1,71 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-unknown-stream"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 100
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/dcae-stnd-defined-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/dcae-stnd-defined-payload-request.json
new file mode 100644 (file)
index 0000000..56371db
--- /dev/null
@@ -0,0 +1,25 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
\ No newline at end of file
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/xnf-stnd-defined-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/xnf-stnd-defined-payload-request.json
new file mode 100644 (file)
index 0000000..56371db
--- /dev/null
@@ -0,0 +1,25 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
\ No newline at end of file
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_ml_response.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_ml_response.json
deleted file mode 100644 (file)
index 576fc89..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"closedLoopControlName":"ControlLoop-Slicing-116d7b00-dbeb-4d03-8719-d0a658fa735b","closedLoopAlarmStart":1604468227374,"closedLoopEventClient":"microservice.sliceAnalysisMS","closedLoopEventStatus":"ONSET","requestID":"0196f8a4-117b-4e51-b013-92e0b7ad95a8","target":"vserver.vserver-name","payload":{"name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","serviceInstanceID":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","globalSubscriberId":"Customer-001","subscriptionServiceType":"Premium","networkType":"AN","additionalProperties":{"modifyAction":"reconfigure","snssaiList":["001-00110"],"sliceProfileId":"878f32c0-3699-4dbd-95a3-1f01d6c763fd","resourceConfig":{"snssai":"001-00110","data":[{"gNBCUName":"cucpserver1","nearRTRICId":"11","cellCUList":[{"cellLocalId":103593989,"configData":{"maxNumberofConns":"20","predictedMaxNumberofConns":"25","lastUpdatedTS":"yyyy/MM/dd HH:mm:ss"}}]}]},"nsiInfo":{"nsiName":"","nsiId":"2d43ff64-76bd-437b-ab98-1e7aa3e5df5f"},"scriptName":"AN"}},"from":"DCAE","version":"1.0.2","target_type":"VNF","AAI":{"vserver.is-closed-loop-disabled":"false","vserver.prov-status":"ACTIVE","vserver.vserver-name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82"}}
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm.json
deleted file mode 100644 (file)
index a1b4916..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"closedLoopControlName":"ControlLoop-Slicing-116d7b00-dbeb-4d03-8719-d0a658fa735b","closedLoopAlarmStart":1608198244852,"closedLoopEventClient":"microservice.sliceAnalysisMS","closedLoopEventStatus":"ONSET","requestID":"4fae9c22-59f1-47e8-a8a2-c4cbb79418cc","target":"vserver.vserver-name","payload":{"name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","serviceInstanceID":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","globalSubscriberId":"Customer-001","subscriptionServiceType":"Premium","networkType":"AN","additionalProperties":{"modifyAction":"reconfigure","snssaiList":["001-010000"],"sliceProfileId":"878f32c0-3699-4dbd-95a3-1f01d6c763fd","resourceConfig":{"11":{"dLThptPerSlice":29,"uLThptPerSlice":32},"22":{"dLThptPerSlice":25,"uLThptPerSlice":28}},"nsiInfo":{"nsiName":"","nsiId":"f61681df-cbbe-4851-9ab6-fab24c8c77b4"},"scriptName":"AN"}},"from":"DCAE","version":"1.0.2","target_type":"VNF","AAI":{"vserver.is-closed-loop-disabled":"false","vserver.prov-status":"ACTIVE","vserver.vserver-name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82"}}
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm1.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm1.json
deleted file mode 100644 (file)
index bd4ca92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"closedLoopControlName":"ControlLoop-Slicing-116d7b00-dbeb-4d03-8719-d0a658fa735b","closedLoopAlarmStart":1604494201291,"closedLoopEventClient":"microservice.sliceAnalysisMS","closedLoopEventStatus":"ONSET","requestID":"0afb48b6-db08-45d6-aff3-675255f51ed5","target":"vserver.vserver-name","payload":{"name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","serviceInstanceID":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","globalSubscriberId":"Customer-001","subscriptionServiceType":"Premium","networkType":"AN","additionalProperties":{"modifyAction":"reconfigure","snssaiList":["001-00110"],"sliceProfileId":"878f32c0-3699-4dbd-95a3-1f01d6c763fd","resourceConfig":{"11":{"dLThptPerSlice":50,"uLThptPerSlice":40}},"nsiInfo":{"nsiName":"","nsiId":"a7f1242d-5889-46c3-bb0a-800c6ae388d1"},"scriptName":"AN"}},"from":"DCAE","version":"1.0.2","target_type":"VNF","AAI":{"vserver.is-closed-loop-disabled":"false","vserver.prov-status":"ACTIVE","vserver.vserver-name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82"}}
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm2.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm2.json
deleted file mode 100644 (file)
index bd4ca92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"closedLoopControlName":"ControlLoop-Slicing-116d7b00-dbeb-4d03-8719-d0a658fa735b","closedLoopAlarmStart":1604494201291,"closedLoopEventClient":"microservice.sliceAnalysisMS","closedLoopEventStatus":"ONSET","requestID":"0afb48b6-db08-45d6-aff3-675255f51ed5","target":"vserver.vserver-name","payload":{"name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","serviceInstanceID":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","globalSubscriberId":"Customer-001","subscriptionServiceType":"Premium","networkType":"AN","additionalProperties":{"modifyAction":"reconfigure","snssaiList":["001-00110"],"sliceProfileId":"878f32c0-3699-4dbd-95a3-1f01d6c763fd","resourceConfig":{"11":{"dLThptPerSlice":50,"uLThptPerSlice":40}},"nsiInfo":{"nsiName":"","nsiId":"a7f1242d-5889-46c3-bb0a-800c6ae388d1"},"scriptName":"AN"}},"from":"DCAE","version":"1.0.2","target_type":"VNF","AAI":{"vserver.is-closed-loop-disabled":"false","vserver.prov-status":"ACTIVE","vserver.vserver-name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82"}}
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm3.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm3.json
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
index e7d923f..a2c06fe 100644 (file)
@@ -6,9 +6,9 @@ Library     json
 Library     String
 
 *** Variables ***
-${SDNC_KEYSTORE_CONFIG_PATH}    /config/netconf-keystore:keystore
-${SDNC_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator
-${PNFSIM_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist
+${SDNC_KEYSTORE_CONFIG_PATH}    /restconf/config/netconf-keystore:keystore
+${SDNC_MOUNT_PATH}    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator
+${PNFSIM_MOUNT_PATH}    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist
 ${BP_UPLOAD_URL}    /api/v1/blueprint-model/publish
 ${BP_PROCESS_URL}    /api/v1/execution-service/process
 ${BP_ARCHIVE_PATH}    ${CURDIR}/data/blueprint_archive.zip
@@ -17,9 +17,9 @@ ${BP_ARCHIVE_PATH}    ${CURDIR}/data/blueprint_archive.zip
 *** Test Cases ***
 Test SDNC Keystore
     [Documentation]    Checking keystore after SDNC installation
-    Create Session   sdnc  http://localhost:8282/restconf
+    Create Session   sdnc  http://localhost:8282
     &{headers}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Get Request    sdnc    ${SDNC_KEYSTORE_CONFIG_PATH}    headers=${headers}
+    ${resp}=    GET On Session    sdnc    ${SDNC_KEYSTORE_CONFIG_PATH}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${keystoreContent}=    Convert To String    ${resp.content}
     Log to console  *************************
@@ -32,7 +32,7 @@ Test BP-PROC upload blueprint archive
     ${bp_archive}=    Get Binary File    ${BP_ARCHIVE_PATH}
     &{bp_file}=    create Dictionary    file    ${bp_archive}
     &{headers}=  Create Dictionary    Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-    ${resp}=    Post Request    blueprint    ${BP_UPLOAD_URL}    files=${bp_file}    headers=${headers}
+    ${resp}=    POST On Session    blueprint    ${BP_UPLOAD_URL}    files=${bp_file}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Test BP-PROC CONFIG-ASSIGN
@@ -41,7 +41,7 @@ Test BP-PROC CONFIG-ASSIGN
     ${config-assign}=    Get File     ${CURDIR}${/}data${/}config-assign.json
     Log to console  ${config-assign}
     &{headers}=  Create Dictionary    Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Post Request    blueprint    ${BP_PROCESS_URL}    data=${config-assign}    headers=${headers}
+    ${resp}=    POST On Session    blueprint    ${BP_PROCESS_URL}    data=${config-assign}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Test BP-PROC CONFIG-DEPLOY
@@ -50,20 +50,20 @@ Test BP-PROC CONFIG-DEPLOY
     ${config-deploy}=    Get File     ${CURDIR}${/}data${/}config-deploy.json
     Log to console  ${config-deploy}
     &{headers}=  Create Dictionary    Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Post Request    blueprint    ${BP_PROCESS_URL}    data=${config-deploy}    headers=${headers}
+    ${resp}=    POST On Session    blueprint    ${BP_PROCESS_URL}    data=${config-deploy}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Test PNF Configuration update
     [Documentation]    Checking PNF configuration params
-    Create Session   sdnc  http://localhost:8282/restconf
+    Create Session   sdnc  http://localhost:8282
     ${mount}=    Get File     ${CURDIR}${/}data${/}mount.xml
     Log to console  ${mount}
     &{headers}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/xml    Accept=application/xml
-    ${resp}=    Put Request    sdnc    ${SDNC_MOUNT_PATH}    data=${mount}    headers=${headers}
+    ${resp}=    PUT On Session    sdnc    ${SDNC_MOUNT_PATH}    data=${mount}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    201
     Sleep  10
     &{headers1}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/json    Accept=application/json
-    ${resp1}=    Get Request    sdnc    ${PNFSIM_MOUNT_PATH}    headers=${headers1}
+    ${resp1}=    GET On Session    sdnc    ${PNFSIM_MOUNT_PATH}    headers=${headers1}
     Should Be Equal As Strings    ${resp1.status_code}    200
     Log to console  ${resp1.content}
     Should Contain  ${resp1.text}     {"netconf-id":30,"netconf-param":3000}