From e003192163f37c339cec20a144f3b74aad3a6ecb Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 21 May 2018 21:53:42 -0700 Subject: Clean up HEAT health check script Change-Id: I4215c561149bd4d6d21e37f23fae5c8dd041317a Issue-ID: INT-381 Signed-off-by: Gary Wu --- test/ete/scripts/run-healthcheck.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/ete/scripts/run-healthcheck.sh b/test/ete/scripts/run-healthcheck.sh index e2ed3986f..e97ac3ff5 100755 --- a/test/ete/scripts/run-healthcheck.sh +++ b/test/ete/scripts/run-healthcheck.sh @@ -19,10 +19,12 @@ fi ssh-keygen -R ${ROBOT_IP} +set +x timeout 15m ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "OS_PROJECT_ID=$OS_PROJECT_ID OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD bash -s" < ./remote/run-robot.sh RESULT=$? +set -x -LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | head -1") +LOG_DIR=$(ssh -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | grep health | head -1") echo "Browse Robot results at http://${ROBOT_IP}:88/logs/${LOG_DIR}/" -rsync -e "ssh -i ${SSH_KEY}" -avPz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/ +rsync -e "ssh -i ${SSH_KEY}" -avtz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/ exit $RESULT -- cgit 1.2.3-korg From 3b1500cf326bd4941274c44f6622287a571af3a3 Mon Sep 17 00:00:00 2001 From: ranpollak Date: Tue, 22 May 2018 17:26:40 +0300 Subject: Add Jmeter script 4.0 Issue-ID: INT-300 Change-Id: I5cb70ced36ec1510e4ceec6da328f8200f75ad59 Signed-off-by: ranpollak --- S3Ptools/Jmeter/Jmeter.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 S3Ptools/Jmeter/Jmeter.sh diff --git a/S3Ptools/Jmeter/Jmeter.sh b/S3Ptools/Jmeter/Jmeter.sh new file mode 100644 index 000000000..46c37305c --- /dev/null +++ b/S3Ptools/Jmeter/Jmeter.sh @@ -0,0 +1,6 @@ +#!/bin/bash +wget http://redrockdigimark.com/apachemirror//jmeter/binaries/apache-jmeter-4.0.tgz +tar -xf apache-jmeter-4.0.tgz +cd apache-jmeter-4.0/bin/ +\rm -rf apache-jmeter-4.0.tgz +./jmeter -- cgit 1.2.3-korg From 93b19579e74fa62396f0f2b5c17d35c783d8c8e0 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 22 May 2018 07:57:50 -0700 Subject: Update HEAT env to match template changes Change-Id: Ifca284bb35ef0edc8f9f2a0d31d65301ed5d8959 Issue-ID: INT-504 Signed-off-by: Gary Wu --- test/ete/labs/gwu/onap-openstack-template.env | 2 +- test/ete/labs/huawei/onap-openstack-template.env | 2 +- test/ete/labs/tlab/onap-openstack-template.env | 2 +- test/ete/labs/windriver/onap-openstack-template.env | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env index a7c230e0e..fc59c48e8 100644 --- a/test/ete/labs/gwu/onap-openstack-template.env +++ b/test/ete/labs/gwu/onap-openstack-template.env @@ -30,7 +30,7 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - nexus_repo: https://nexus.onap.org/content/sites/raw + nexus_artifact_repo: https://nexus.onap.org nexus_docker_repo: 192.168.1.51:5000 diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env index bffbd2df2..cff445c93 100644 --- a/test/ete/labs/huawei/onap-openstack-template.env +++ b/test/ete/labs/huawei/onap-openstack-template.env @@ -30,7 +30,7 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - nexus_repo: https://nexus.onap.org/content/sites/raw + nexus_artifact_repo: https://nexus.onap.org nexus_docker_repo: 10.145.122.118:5000 diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env index b10e4793b..a75438f7a 100644 --- a/test/ete/labs/tlab/onap-openstack-template.env +++ b/test/ete/labs/tlab/onap-openstack-template.env @@ -30,7 +30,7 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - nexus_repo: https://nexus.onap.org/content/sites/raw + nexus_artifact_repo: https://nexus.onap.org nexus_docker_repo: 192.168.31.204:5000 diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index 5dada453e..1dbcbc4f6 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -30,7 +30,7 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - nexus_repo: https://nexus.onap.org/content/sites/raw + nexus_artifact_repo: https://nexus.onap.org nexus_docker_repo: 10.12.5.2:5000 -- cgit 1.2.3-korg From 3d4d54839cabea27204a7441f20044d2df871370 Mon Sep 17 00:00:00 2001 From: ehautot Date: Tue, 22 May 2018 16:58:48 +0200 Subject: Fix integration tests: string truncated by robotf Change-Id: I478edc30e03af64e724d1918ddd062fdac26f10c Signed-off-by: ehautot Issue-ID: CLAMP-129 --- test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot b/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot index a9cb78749..8bbf7c85e 100644 --- a/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot +++ b/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot @@ -21,7 +21,7 @@ Verify HolmesModel1 Should Contain Match ${resp} *migrate* Should Contain Match ${resp} *240* Should Contain Match ${resp} *390* - Should Contain Match ${resp} *correlational Logic1* + Should Contain Match ${resp} *Logic1* Should Contain Match ${resp} *config Policy Name1* Verify TCAModel1 -- cgit 1.2.3-korg From b5b530663e49834ecf0b359e32c7264d1a87558d Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 22 May 2018 16:55:22 -0400 Subject: Update AAI version numbers in java manifest Issue-ID: AAI-1156 Change-Id: I566e861b424c246e8a5e0ba48ca7cba6aa9318d6 Signed-off-by: Jimmy Forsyth --- .../src/main/resources/java-manifest.csv | 38 ++++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 4401f4d18..598c4cb85 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -22,15 +22,17 @@ org.onap.aaf.authz,aaf-misc-env,2.1.0 org.onap.aaf.authz,aaf-misc-log4j,2.1.0 org.onap.aaf.authz,aaf-misc-rosetta,2.1.0 org.onap.aaf.authz,aaf-misc-xgen,2.1.0 -org.onap.aai,rest-client,1.2.0 +org.onap.aai,rest-client,1.2.1 org.onap.aai,search-data-service,1.2.0 -org.onap.aai.aai-common,aai-annotations,1.2.1 -org.onap.aai.aai-common,aai-auth,1.2.1 -org.onap.aai.aai-common,aai-common,1.2.1 -org.onap.aai.aai-common,aai-core,1.2.1 -org.onap.aai.aai-common,aai-schema,1.2.1 -org.onap.aai.aai-common,aai-utils,1.2.1 -org.onap.aai.data-router,data-router,1.2.0 +org.onap.aai.aai-common,aai-annotations,1.2.4 +org.onap.aai.aai-common,aai-auth,1.2.4 +org.onap.aai.aai-common,aai-common,1.2.4 +org.onap.aai.aai-common,aai-core,1.2.4 +org.onap.aai.aai-common,aai-schema,1.2.4 +org.onap.aai.aai-common,aai-utils,1.2.4 +org.onap.aai.babel,babel,1.2.0 +org.onap.aai.champ,champ,1.2.2 +org.onap.aai.data-router,data-router,1.2.1 org.onap.aai.esr-gui,aai-esr-gui,1.0.0 org.onap.aai.esr-gui,common,1.0.0 org.onap.aai.esr-gui,distribution,1.0.0 @@ -39,20 +41,20 @@ org.onap.aai.esr-gui,portal,1.0.0 org.onap.aai.esr-server,aai-esr-server,1.0.0 org.onap.aai.esr-server,esr-manager,1.0.0 org.onap.aai.esr-server,standalone,1.0.0 -org.onap.aai.event-client,event-client,1.2.0 -org.onap.aai.event-client,event-client-api,1.2.0 -org.onap.aai.event-client,event-client-dmaap,1.2.0 -org.onap.aai.event-client,event-client-kafka,1.2.0 -org.onap.aai.logging-service,common-logging,1.2.0 -org.onap.aai.logging-service,eelf-logging,1.2.0 -org.onap.aai.logging-service,logging-api,1.2.0 -org.onap.aai.logging-service,logging-service,1.2.0 +org.onap.aai.event-client,event-client,1.2.2 +org.onap.aai.event-client,event-client-api,1.2.2 +org.onap.aai.event-client,event-client-dmaap,1.2.2 +org.onap.aai.event-client,event-client-kafka,1.2.2 +org.onap.aai.logging-service,common-logging,1.2.2 +org.onap.aai.logging-service,eelf-logging,1.2.2 +org.onap.aai.logging-service,logging-api,1.2.2 +org.onap.aai.logging-service,logging-service,1.2.2 org.onap.aai.model-loader,model-loader,1.2.0 org.onap.aai.resources,aai-resources,1.2.0 org.onap.aai.resources,resources,1.2.0 -org.onap.aai.router-core,router-core,1.2.0 +org.onap.aai.router-core,router-core,1.2.1 org.onap.aai.sparky-be,sparky-be,1.2.0 -org.onap.aai.sparky-fe,sparky-fe,1.2.0 +org.onap.aai.sparky-fe,sparky-fe,1.2.1 org.onap.aai.traversal,aai-traversal,1.2.0 org.onap.aai.traversal,traversal,1.2.0 org.onap.ccsdk.parent,binding-parent,1.0.1 -- cgit 1.2.3-korg From c21eb720fdab47359a3e5dc5a755c73023bc6d32 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Tue, 22 May 2018 14:40:02 -0700 Subject: Update appc image version to next version The new appc master image version has now moved to 1.4.0-SNAPSHOT-latest from 1.3.0-SNAPSHOT-latest Change-Id: Ia19e287a4f2b103c0a6e4e5356b263da190c0ef7 Signed-off-by: Patrick Brady Issue-ID: APPC-916 --- test/csit/plans/appc/healthcheck/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/csit/plans/appc/healthcheck/setup.sh b/test/csit/plans/appc/healthcheck/setup.sh index afc95204a..da441ea54 100755 --- a/test/csit/plans/appc/healthcheck/setup.sh +++ b/test/csit/plans/appc/healthcheck/setup.sh @@ -20,7 +20,7 @@ SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source ${WORKSPACE}/test/csit/scripts/appc/script1.sh -export APPC_DOCKER_IMAGE_VERSION=1.3.0-SNAPSHOT-latest +export APPC_DOCKER_IMAGE_VERSION=1.4.0-SNAPSHOT-latest export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest export BRANCH=master export SOLUTION_NAME=onap -- cgit 1.2.3-korg From bbae7a7e35c5ffa7a5a309ad62659663b9205974 Mon Sep 17 00:00:00 2001 From: Pawel Kadlubanski Date: Wed, 23 May 2018 16:33:20 +0200 Subject: Update in pnfsimulator code. Correction problem with license. Issue-ID: INT-458 Change-Id: I961133ff5695b241a8c82c87a0e1aa800e79d6d8 Signed-off-by: Pawel Kadlubanski --- test/mocks/pnfsimulator/LICENSE.txt | 36 --- test/mocks/pnfsimulator/pom.xml | 276 ++++++++++----------- .../src/main/java/org/onap/pnfsimulator/Main.java | 4 +- .../org/onap/pnfsimulator/cli/SimulatorParams.java | 2 +- .../pnfsimulator/cli/SimulatorParamsProvider.java | 2 +- .../pnfsimulator/message/MessageConstants.java | 2 +- .../onap/pnfsimulator/message/MessageProvider.java | 2 +- .../org/onap/pnfsimulator/simulator/Simulator.java | 4 +- .../pnfsimulator/simulator/SimulatorFactory.java | 8 +- .../simulator/client/HttpClientProvider.java | 2 +- .../simulator/validation/ParamsValidator.java | 103 +++----- .../simulator/validation/ValidationException.java | 20 -- .../pnfsimulator/SimulatorParamsProviderTest.java | 20 -- .../java/org/onap/pnfsimulator/SimulatorTest.java | 20 -- .../pnfsimulator/message/MessageProviderTest.java | 20 -- 15 files changed, 189 insertions(+), 332 deletions(-) delete mode 100644 test/mocks/pnfsimulator/LICENSE.txt diff --git a/test/mocks/pnfsimulator/LICENSE.txt b/test/mocks/pnfsimulator/LICENSE.txt deleted file mode 100644 index 22e7ef85c..000000000 --- a/test/mocks/pnfsimulator/LICENSE.txt +++ /dev/null @@ -1,36 +0,0 @@ -/* -* ============LICENSE_START========================================== -* =================================================================== -* Copyright (c) 2018 NOKIA Intellectual Property. All rights reserved. -* =================================================================== -* -* Unless otherwise specified, all software contained herein is licensed -* under the Apache License, Version 2.0 (the "License"); -* you may not use this software except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* -* -* Unless otherwise specified, all documentation contained herein is licensed -* under the Creative Commons License, Attribution 4.0 Intl. (the "License"); -* you may not use this documentation except in compliance with the License. -* You may obtain a copy of the License at -* -* https://creativecommons.org/licenses/by/4.0/ -* -* Unless required by applicable law or agreed to in writing, documentation -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ============LICENSE_END============================================ -*/ \ No newline at end of file diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml index 1f1f46a04..105cd03cf 100644 --- a/test/mocks/pnfsimulator/pom.xml +++ b/test/mocks/pnfsimulator/pom.xml @@ -1,155 +1,151 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.oparent - oparent - 0.1.1 - + org.onap.pnfsimulator + pnf-simulator + 1.0-SNAPSHOT - org.onap.pnfsimulator - pnf-simulator - 1.0 - - pnf-simulator + pnf-simulator UTF-8 1.8 1.8 org.onap.pnfsimulator.Main + latest libs - ${project.build.directory}/${dependency.directory.name} - - + ${project.build.directory}/${dependency.directory.name} + - - - org.apache.logging.log4j - log4j-core - 2.11.0 - - - commons-io - commons-io - 2.6 - - - org.json - json - 20180130 - - - org.apache.httpcomponents - httpclient - 4.5.5 - - - com.google.guava - guava - 21.0 - - - commons-cli - commons-cli - 1.4 - - - org.junit.jupiter - junit-jupiter-engine - 5.1.1 - test - - - org.assertj - assertj-core - 3.9.1 - test - - - org.apache.commons - commons-lang3 - 3.7 - - + + + org.apache.logging.log4j + log4j-core + 2.11.0 + + + commons-io + commons-io + 2.6 + + + org.json + json + 20180130 + + + org.apache.httpcomponents + httpclient + 4.5.5 + + + com.google.guava + guava + 21.0 + + + commons-cli + commons-cli + 1.4 + + + org.junit.jupiter + junit-jupiter-engine + 5.1.1 + test + + + org.assertj + assertj-core + 3.9.1 + test + + + org.apache.commons + commons-lang3 + 3.7 + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - true - true - - - - maven-surefire-plugin - 2.19 - - - org.junit.platform - junit-platform-surefire-provider - 1.1.1 - - - - true - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - ${dependency.directory.location} - runtime - true - - - - copy-external-dependencies - package - - copy-dependencies - - - - - - com.spotify - docker-maven-plugin - - false - - ${onap.nexus.dockerregistry.daily}/onap/${project.artifactId} - - openjdk:8-jdk-alpine - java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class} - - - - ${dependency.directory.name} - ${dependency.directory.location} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - ${project.version} - latest - - ${onap.nexus.dockerregistry.daily} - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + true + true + + + + maven-surefire-plugin + 2.19 + + + org.junit.platform + junit-platform-surefire-provider + 1.1.1 + + + + true + true + + + + org.apache.maven.plugins + maven-dependency-plugin + + ${dependency.directory.location} + runtime + true + + + + copy-external-dependencies + package + + copy-dependencies + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + ${project.name} + ${docker.image.tag} + openjdk:8-jdk-alpine + java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class} + + + ${dependency.directory.name} + ${dependency.directory.location} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + build-image + package + + build + + + + + + diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/Main.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/Main.java index 8efdfe08d..37f1b21c9 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/Main.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/Main.java @@ -35,7 +35,7 @@ public class Main { private static Logger logger = LogManager.getLogger(Main.class); private static SimulatorFactory simulatorFactory = - new SimulatorFactory(MessageProvider.getInstance(), ParamsValidator.getInstance()); + new SimulatorFactory(MessageProvider.getInstance()); public static void main(String[] args) { @@ -51,7 +51,7 @@ public class Main { } catch (ParseException e) { logger.error("Invalid cli params", e); } catch (ValidationException e){ - logger.error("Missing some mandatory params:", e); + logger.error(e); } } } diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParams.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParams.java index 4c662ab5f..2ca0b5e7b 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParams.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParams.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParamsProvider.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParamsProvider.java index 5c4d219a0..ab705e907 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParamsProvider.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/cli/SimulatorParamsProvider.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java index 194e8960a..b49c1ea1d 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java index 95f9dfc55..163d4e62d 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java index d9559ecb2..ff2ca862a 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ @@ -48,7 +48,7 @@ public class Simulator { Instant endTime = Instant.now().plus(duration); while (runningTimeNotExceeded(endTime)) { try { - logger.info("MESSAGE TO BE SENT:\n{}", messageBody.toString(4)); + logger.info(()-> "MESSAGE TO BE SENT:\n" + messageBody.toString(4)); clientProvider.sendMsg(messageBody.toString()); Thread.sleep(interval.toMillis()); } catch (InterruptedException e) { diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java index 9f3d48ab3..e3a003831 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ @@ -37,19 +37,17 @@ import org.onap.pnfsimulator.simulator.validation.ValidationException; public class SimulatorFactory { private MessageProvider messageProvider; - private ParamsValidator paramsValidator; - public SimulatorFactory(MessageProvider messageProvider, ParamsValidator paramsValidator) { + public SimulatorFactory(MessageProvider messageProvider) { this.messageProvider = messageProvider; - this.paramsValidator = paramsValidator; } public Simulator create(String vesServerUrl, String configFilePath) throws IOException, ValidationException { String configJson = FileUtils.readFileToString(new File(configFilePath), StandardCharsets.UTF_8); JSONObject configObject = new JSONObject(configJson); + ParamsValidator.forObject(configObject).validate(); - paramsValidator.validate(configObject); Duration duration = Duration.ofSeconds(parseJsonField(configObject, TEST_DURATION)); Duration interval = Duration.ofSeconds(parseJsonField(configObject, MESSAGE_INTERVAL)); JSONObject messageBody = messageProvider.createMessage(configObject); diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientProvider.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientProvider.java index 7ff506923..54d2c9fbb 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientProvider.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientProvider.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java index 57408660a..6cdb781f1 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ParamsValidator.java @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * org.onap.integration - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - package org.onap.pnfsimulator.simulator.validation; import static org.onap.pnfsimulator.message.MessageConstants.MESSAGE_INTERVAL; @@ -28,71 +8,70 @@ import static org.onap.pnfsimulator.message.MessageConstants.PNF_VENDOR_NAME; import static org.onap.pnfsimulator.message.MessageConstants.TEST_DURATION; import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; import java.util.List; -import java.util.function.BiPredicate; +import java.util.Map; +import java.util.Map.Entry; +import java.util.function.Predicate; +import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; public class ParamsValidator { - private final static String MISSING_PARAMS_ERROR = "Some mandatory params are missing"; - private static ParamsValidator instance; - + private final static String MISSING_PARAMS_MESSAGE = "Following mandatory params are missing:\n"; + private final Map> validators = ImmutableMap + .>builder() + .put(TEST_DURATION, this::isNumeric) + .put(MESSAGE_INTERVAL, this::isNumeric) + .put(PNF_SERIAL_NUMBER, this::isDefined) + .put(PNF_VENDOR_NAME, this::isDefined) + .put(PNF_OAM_IPV4_ADDRESS, this::isDefined) + .put(PNF_OAM_IPV6_ADDRESS, this::isDefined) + .build(); + + private JSONObject subject; + + private ParamsValidator(JSONObject paramsObject) { + subject = paramsObject; + } - public static ParamsValidator getInstance() { - if (instance == null) { - instance = new ParamsValidator(); - } - return instance; + public static ParamsValidator forObject(JSONObject configObject) { + return new ParamsValidator(configObject); } - public void validate(JSONObject params) throws ValidationException { - ImmutableMap> paramValidators = ImmutableMap - .>builder() - .put(TEST_DURATION, this::isNotNumeric) - .put(MESSAGE_INTERVAL, this::isNotNumeric) - .put(PNF_SERIAL_NUMBER, this::nullOrEmpty) - .put(PNF_VENDOR_NAME, this::nullOrEmpty) - .put(PNF_OAM_IPV4_ADDRESS, this::nullOrEmpty) - .put(PNF_OAM_IPV6_ADDRESS, this::nullOrEmpty) - .build(); - - List missingParams = new ArrayList<>(); - - paramValidators.forEach((param, validator) -> { - if (validator.test(params, param)) { - missingParams.add(param); - } - }); - - clearIPError(missingParams); + public void validate() throws ValidationException { + + List missingParams = validators + .entrySet() + .stream() + .filter(entry -> !entry.getValue().test(entry.getKey())) + .map(Entry::getKey) + .collect(Collectors.toList()); + + resolveMissingIP(missingParams); + if (!missingParams.isEmpty()) { throw new ValidationException(constructMessage(missingParams)); } } private String constructMessage(List missingParams) { - StringBuilder msg = new StringBuilder(MISSING_PARAMS_ERROR); - - missingParams.forEach(param -> { - msg.append('\n'); - msg.append(param); - }); - return msg.toString(); + return MISSING_PARAMS_MESSAGE + missingParams + .stream() + .collect(Collectors.joining("\n")); } - private boolean isNotNumeric(JSONObject params, String param) { - return nullOrEmpty(params, param) || !StringUtils.isNumeric(params.getString(param)); + private boolean isNumeric(String param) { + return isDefined(param) && StringUtils.isNumeric(subject.getString(param)); } - private boolean nullOrEmpty(JSONObject params, String param) { - return !params.has(param) || params.getString(param).isEmpty(); + private boolean isDefined(String param) { + return subject.has(param) && !subject.getString(param).isEmpty(); } - private void clearIPError(List missingParams) { + private void resolveMissingIP(List missingParams) { // if only one IP is missing clear the error if (!(missingParams.contains(PNF_OAM_IPV4_ADDRESS) && missingParams.contains(PNF_OAM_IPV6_ADDRESS))) { missingParams.remove(PNF_OAM_IPV4_ADDRESS); diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java index 086997f85..9855a784e 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * org.onap.integration - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - package org.onap.pnfsimulator.simulator.validation; public class ValidationException extends Exception { diff --git a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/SimulatorParamsProviderTest.java b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/SimulatorParamsProviderTest.java index bd6584233..96397eae1 100644 --- a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/SimulatorParamsProviderTest.java +++ b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/SimulatorParamsProviderTest.java @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * org.onap.integration - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - package org.onap.pnfsimulator; import org.apache.commons.cli.ParseException; diff --git a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/SimulatorTest.java b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/SimulatorTest.java index e3db4c837..ccbb72846 100644 --- a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/SimulatorTest.java +++ b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/SimulatorTest.java @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * org.onap.integration - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - package org.onap.pnfsimulator; import org.assertj.core.api.Assertions; diff --git a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java index d462d2592..38540577e 100644 --- a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java +++ b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * org.onap.integration - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - package org.onap.pnfsimulator.message; import static org.junit.jupiter.api.Assertions.assertEquals; -- cgit 1.2.3-korg From 0c4a64a8eef00a9ff92dbac1c2a66580e081c9d1 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 23 May 2018 08:53:53 -0700 Subject: Fix robot public key string Change-Id: I08572bf22db2e6eb2fcbc48419452f373fdcd504 Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/env/gwu/onap.env | 2 +- deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env | 2 +- deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env | 2 +- deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env | 2 +- deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-00.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-01.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-02.env | 8 +++++++- deployment/heat/onap-oom/env/windriver/Integration-SB-03.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-04.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-05.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-06.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-07.env | 2 +- 14 files changed, 20 insertions(+), 14 deletions(-) diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env index 3c5136405..7bdd9a58d 100644 --- a/deployment/heat/onap-oom/env/gwu/onap.env +++ b/deployment/heat/onap-oom/env/gwu/onap.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env index 26492c8f9..445e5acde 100644 --- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env +++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env index 5757d40c3..ac1d3d836 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env index 5757d40c3..ac1d3d836 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env index 5757d40c3..ac1d3d836 100644 --- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env +++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env index 76d3ef648..a3d137270 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env index 76d3ef648..a3d137270 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env index 76d3ef648..a3d137270 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env index 76d3ef648..dd4d55d9f 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env @@ -29,9 +29,15 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + esr: + image: onap/aai/esr-server:latest + esr-gui: + image: onap/aai/esr-gui:latest diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env index 76d3ef648..a3d137270 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env index 76d3ef648..a3d137270 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env index 76d3ef648..a3d137270 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env index 76d3ef648..a3d137270 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env index 76d3ef648..a3d137270 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env @@ -29,7 +29,7 @@ parameters: openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" -- cgit 1.2.3-korg From 3432500c901b725e33eeb6bd5739ff499e8127b0 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 23 May 2018 11:37:25 -0700 Subject: Default 3 node APPC and SDNC Change-Id: I422c6619ed41ea19736b0a77c37399d22e9ed30b Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/env/gwu/onap.env | 4 ++++ deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env | 4 ++++ deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env | 4 ++++ deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env | 4 ++++ deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-SB-00.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-SB-01.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-SB-02.env | 6 ++---- deployment/heat/onap-oom/env/windriver/Integration-SB-03.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-SB-04.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-SB-05.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-SB-06.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-SB-07.env | 4 ++++ 14 files changed, 54 insertions(+), 4 deletions(-) diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env index 7bdd9a58d..2b10306f5 100644 --- a/deployment/heat/onap-oom/env/gwu/onap.env +++ b/deployment/heat/onap-oom/env/gwu/onap.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://192.168.1.11:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env index 445e5acde..4cdd16c54 100644 --- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env +++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.145.122.117:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env index ac1d3d836..ec220dc58 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env index ac1d3d836..ec220dc58 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env index ac1d3d836..ec220dc58 100644 --- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env +++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env index a3d137270..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env index a3d137270..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env index a3d137270..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env index dd4d55d9f..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env @@ -37,7 +37,5 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 - esr: - image: onap/aai/esr-server:latest - esr-gui: - image: onap/aai/esr-gui:latest + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env index a3d137270..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env index a3d137270..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env index a3d137270..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env index a3d137270..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env index a3d137270..8336b504b 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env @@ -35,3 +35,7 @@ parameters: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 -- cgit 1.2.3-korg From d257997583713a65c404ed8a48b21a414d1f2804 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 23 May 2018 12:36:46 -0700 Subject: Enhance OOM deploy script Change-Id: I694381cfb6d1ba8c5fb77c594340166d8afdc377 Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/scripts/deploy.sh | 38 +++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index 656b410a9..134ba6bdc 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -20,11 +20,25 @@ for n in $(seq 1 5); do cd $WORKSPACE/deployment/heat/onap-oom envsubst < $ENV_FILE > $ENV_FILE~ - openstack stack create -t ./onap-oom.yaml -e $ENV_FILE~ onap-oom + + if ! openstack stack create -t ./onap-oom.yaml -e $ENV_FILE~ onap-oom; then + break + fi + + while [ "CREATE_IN_PROGRESS" == "$(openstack stack show -c stack_status -f value onap-oom)" ]; do + sleep 20 + done + + STATUS=$(openstack stack show -c stack_status -f value onap-oom) + echo $STATUS + if [ "CREATE_COMPLETE" != "$STATUS" ]; then + break + fi for i in $(seq 1 30); do sleep 30 RANCHER_IP=$(openstack stack output show onap-oom rancher_vm_ip -c output_value -f value) + K8S_IP=$(openstack stack output show onap-oom k8s_1_vm_ip -c output_value -f value) timeout 1 ping -c 1 "$RANCHER_IP" && break done @@ -38,18 +52,30 @@ if ! timeout 1 ping -c 1 "$RANCHER_IP"; then exit 2 fi +ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)" + ssh-keygen -R $RANCHER_IP for n in $(seq 1 6); do - timeout 15m ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' + timeout 15m ssh -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' RESULT=$? if [ $RESULT -eq 0 ]; then break fi sleep 15m done -ROBOT_POD=$(ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') -LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP "sudo su -c \"kubectl exec $ROBOT_POD --namespace onap -- ls -1t /share/logs | head -1\"") +ROBOT_POD=$(ssh -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') +if [ "$ROBOT_POD" == "" ]; then + exit 1 +fi + +LOG_DIR=$(echo "kubectl exec -n onap $ROBOT_POD -- ls -1t /share/logs | grep {robot-tag} | head -1" | ssh -i $SSH_KEY ubuntu@$RANCHER_IP sudo su) +if [ "$LOG_DIR" == "" ]; then + exit 1 +fi + +echo "kubectl cp -n onap $ROBOT_POD:share/logs/$LOG_DIR /tmp/robot/logs/$LOG_DIR" | ssh -i $SSH_KEY ubuntu@$RANCHER_IP sudo su +rsync -e "ssh -i $SSH_KEY" -avtz ubuntu@$RANCHER_IP:/tmp/robot/logs/$LOG_DIR/ $WORKSPACE/archives/ + +echo "Browse Robot results at http://$K8S_IP:30209/logs/$LOG_DIR/" -K8S_IP=$(openstack stack output show onap-oom k8s_1_vm_ip -c output_value -f value) -wget --user=robot --password=robot -r -np -nH --cut-dirs=2 -R "index.html*" -P $WORKSPACE/archives/ http://$K8S_IP:30209/logs/$LOG_DIR/ exit 0 -- cgit 1.2.3-korg From 268b74dd31537e675aee6291a28c64f0d445e52c Mon Sep 17 00:00:00 2001 From: Kang Xi Date: Wed, 23 May 2018 15:53:42 -0400 Subject: Update to support new SO NBI API - Use new version SO API - Add additional data to the request json, which is required by the new SO API Change-Id: I3ac846c92f07b9d95d4429b4d1b2280ae7e69b62 Issue-ID: INT-461 Signed-off-by: Kang Xi --- test/vcpe/soutils.py | 31 ++++++++++++++++++++++++++++--- test/vcpe/vcpecommon.py | 38 +++++++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 16 deletions(-) diff --git a/test/vcpe/soutils.py b/test/vcpe/soutils.py index cc82068a6..623f12cc3 100755 --- a/test/vcpe/soutils.py +++ b/test/vcpe/soutils.py @@ -18,6 +18,7 @@ class SoUtils: :param vcpecommon: :param api_version: must be 'v4' or 'v5' """ + self.tmp_solution_for_so_bug = False self.logger = logging.getLogger(__name__) self.vcpecommon = vcpecommon if api_version not in self.vcpecommon.so_req_api_url: @@ -49,7 +50,9 @@ class SoUtils: self.logger.error('Invalid request type: {0}. Can only be service/vnf/network/vfmodule'.format(req_type)) return None, None + self.logger.info(url) r = requests.post(url, headers=self.vcpecommon.so_headers, auth=self.vcpecommon.so_userpass, json=req_json) + self.logger.debug(r) response = r.json() self.logger.debug('---------------------------------------------------------------') @@ -58,6 +61,7 @@ class SoUtils: self.logger.debug('---------------------------------------------------------------') req_id = response.get('requestReferences', {}).get('requestId', '') instance_id = response.get('requestReferences', {}).get('instanceId', '') + return req_id, instance_id def check_progress(self, req_id, eta=0, interval=5): @@ -119,7 +123,8 @@ class SoUtils: 'modelInfo': vnf_or_network_model, 'cloudConfiguration': {"lcpCloudRegionId": self.vcpecommon.os_region_name, "tenantId": self.vcpecommon.os_tenant_id}, - 'requestParameters': {"userParams": []} + 'requestParameters': {"userParams": []}, + 'platform': {"platformName": "Platform-Demonstration"} } self.add_req_info(req_details, instance_name, self.vcpecommon.product_family_id) self.add_related_instance(req_details, service_instance_id, service_model) @@ -149,14 +154,23 @@ class SoUtils: } } self.add_req_info(req_details, instance_name) + self.add_project_info(req_details) + self.add_owning_entity(req_details) return {'requestDetails': req_details} + def add_project_info(self, req_details): + req_details['project'] = {'projectName': self.vcpecommon.project_name} + + def add_owning_entity(self, req_details): + req_details['owningEntity'] = {'owningEntityId': self.vcpecommon.owning_entity_id, + 'owningEntityName': self.vcpecommon.owning_entity_name} + def generate_custom_service_request(self, instance_name, model, brg_mac): req_details = { 'modelInfo': model, 'subscriberInfo': {'subscriberName': 'Kaneohe', 'globalSubscriberId': self.vcpecommon.global_subscriber_id}, - 'cloudConfiguration': {"lcpCloudRegionId": self.vcpecommon.os_region_name, + 'cloudConfiguration': {"lcpCloudRegionId": 'CloudOwner_RegionOne', #self.vcpecommon.os_region_name, "tenantId": self.vcpecommon.os_tenant_id}, 'requestParameters': { "userParams": [ @@ -164,12 +178,23 @@ class SoUtils: 'name': 'BRG_WAN_MAC_Address', 'value': brg_mac } + , + { + "name": "Customer_Location", + "value": self.vcpecommon.customer_location_used_by_oof + }, + { + "name": "Homing_Solution", + "value": self.vcpecommon.homing_solution + } ], "subscriptionServiceType": "vCPE", 'aLaCarte': 'false' } } self.add_req_info(req_details, instance_name, self.vcpecommon.custom_product_family_id) + self.add_project_info(req_details) + self.add_owning_entity(req_details) return {'requestDetails': req_details} def create_custom_service(self, csar_file, brg_mac, name_suffix=None): @@ -186,7 +211,7 @@ class SoUtils: parser.svc_model['modelName'], name_suffix]) instance_name = instance_name.lower() req = self.generate_custom_service_request(instance_name, parser.svc_model, brg_mac) - self.logger.debug(json.dumps(req, indent=2, sort_keys=True)) + self.logger.info(json.dumps(req, indent=2, sort_keys=True)) self.logger.info('Creating custom service {0}.'.format(instance_name)) req_id, svc_instance_id = self.submit_create_req(req, 'service') if not self.check_progress(req_id, 140): diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index 5b3e009a3..cac5219ea 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -21,19 +21,19 @@ class VcpeCommon: # set the openstack cloud access credentials here cloud = { '--os-auth-url': 'http://10.12.25.2:5000', - '--os-username': 'YOUR ID', + '--os-username': 'kxi', '--os-user-domain-id': 'default', '--os-project-domain-id': 'default', - '--os-tenant-id': '087050388b204c73a3e418dd2c1fe30b', + '--os-tenant-id': '1e097c6713e74fd7ac8e4295e605ee1e', '--os-region-name': 'RegionOne', - '--os-password': 'YOUR PASSWD', - '--os-project-domain-name': 'Integration-SB-01', + '--os-password': 'n3JhGMGuDzD8', + '--os-project-domain-name': 'Integration-SB-07', '--os-identity-api-version': '3' } common_preload_config = { - 'oam_onap_net': 'oam_onap_c4Uw', - 'oam_onap_subnet': 'oam_onap_c4Uw', + 'oam_onap_net': 'oam_onap_lAky', + 'oam_onap_subnet': 'oam_onap_lAky', 'public_net': 'external', 'public_net_id': '971040b2-7059-49dc-b220-4fab50cb2ad4' } @@ -53,13 +53,17 @@ class VcpeCommon: 'mux_gw': ['10.5.0.10', '10.5.0.1'] } + dcae_ves_collector_name = 'dcae-bootstrap' global_subscriber_id = 'SDN-ETHERNET-INTERNET' + project_name = 'Project-Demonstration' + owning_entity_id = '520cc603-a3c4-4ec2-9ef4-ca70facd79c0' + owning_entity_name = 'OE-Demonstration' def __init__(self, extra_host_names=None): self.logger = logging.getLogger(__name__) self.logger.info('Initializing configuration') - self.host_names = ['so', 'sdnc', 'robot', 'aai-inst1', 'dcaedoks00'] + self.host_names = ['so', 'sdnc', 'robot', 'aai-inst1', self.dcae_ves_collector_name] if extra_host_names: self.host_names.extend(extra_host_names) # get IP addresses @@ -84,6 +88,13 @@ class VcpeCommon: self.common_preload_config['pub_key'] = self.pub_key self.sniro_url = 'http://' + self.hosts['robot'] + ':8080/__admin/mappings' self.sniro_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} + self.homing_solution = 'sniro' # value is either 'sniro' or 'oof' +# self.homing_solution = 'oof' + self.customer_location_used_by_oof = { + "customerLatitude": "32.897480", + "customerLongitude": "-97.040443", + "customerName": "some_company" + } ############################################################################################# # SDNC urls @@ -91,7 +102,7 @@ class VcpeCommon: self.sdnc_db_name = 'sdnctl' self.sdnc_db_user = 'sdnctl' self.sdnc_db_pass = 'gamma' - self.sdnc_db_port = '32768' + self.sdnc_db_port = '32774' self.sdnc_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} self.sdnc_preload_network_url = 'http://' + self.hosts['sdnc'] + \ ':8282/restconf/operations/VNF-API:preload-network-topology-operation' @@ -103,7 +114,7 @@ class VcpeCommon: # SO urls, note: do NOT add a '/' at the end of the url self.so_req_api_url = {'v4': 'http://' + self.hosts['so'] + ':8080/ecomp/mso/infra/serviceInstances/v4', 'v5': 'http://' + self.hosts['so'] + ':8080/ecomp/mso/infra/serviceInstances/v5'} - self.so_check_progress_api_url = 'http://' + self.hosts['so'] + ':8080/ecomp/mso/infra/orchestrationRequests/v2' + self.so_check_progress_api_url = 'http://' + self.hosts['so'] + ':8080/ecomp/mso/infra/orchestrationRequests/v5' self.so_userpass = 'InfraPortalClient', 'password1$' self.so_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} self.so_db_name = 'mso_catalog' @@ -257,7 +268,7 @@ class VcpeCommon: url = 'https://{0}:8443/aai/v11/search/nodes-query?search-node-type={1}&filter={2}:EQUALS:{3}'.format( self.hosts['aai-inst1'], search_node_type, key, node_uuid) - headers = {'Content-Type': 'application/json', 'Accept': 'application/json', 'X-FromAppID': 'vCPE-Robot'} + headers = {'Content-Type': 'application/json', 'Accept': 'application/json', 'X-FromAppID': 'vCPE-Robot', 'X-TransactionId': 'get_aai_subscr'} requests.packages.urllib3.disable_warnings() r = requests.get(url, headers=headers, auth=self.aai_userpass, verify=False) response = r.json() @@ -313,7 +324,8 @@ class VcpeCommon: if len(ip_dict) != len(keywords): self.logger.error('Cannot find all desired IP addresses for %s.', keywords) self.logger.error(json.dumps(ip_dict, indent=4, sort_keys=True)) - sys.exit() + self.logger.error('Temporarily continue.. remember to check back vcpecommon.py line: 316') +# sys.exit() return ip_dict def del_vgmux_ves_mode(self): @@ -329,8 +341,8 @@ class VcpeCommon: def set_vgmux_ves_collector(self ): url = self.vpp_ves_url.format(self.hosts['mux']) data = {'config': - {'server-addr': self.hosts['dcaedoks00'], - 'server-port': '8080', + {'server-addr': self.hosts[self.dcae_ves_collector_name], + 'server-port': '8081', 'read-interval': '10', 'is-add':'1' } -- cgit 1.2.3-korg From 8053f360cab41003739bb3023b63027aa4cb60be Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 23 May 2018 13:44:36 -0700 Subject: Clean up heat template env files Change-Id: I34ffb9b13b0b5f90733e1b37def051c0132ee9ac Issue-ID: INT-505 Signed-off-by: Gary Wu --- test/ete/labs/gwu/onap-openstack-template.env | 4 ---- test/ete/labs/huawei/onap-openstack-template.env | 4 ---- test/ete/labs/tlab/onap-openstack-template.env | 4 ---- test/ete/labs/windriver/onap-openstack-template.env | 4 ---- 4 files changed, 16 deletions(-) diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env index fc59c48e8..c2ef4034a 100644 --- a/test/ete/labs/gwu/onap-openstack-template.env +++ b/test/ete/labs/gwu/onap-openstack-template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: m1.xlarge - flavor_xxlarge: m1.xlarge # purposely use a smaller VM here to reduce RAM usage - vm_base_name: onap key_name: onap_key @@ -54,8 +52,6 @@ parameters: openstack_region: RegionOne - horizon_url: http://192.168.1.11/horizon - keystone_url: http://192.168.1.11:5000 cloud_env: RegionOne diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env index cff445c93..900b08789 100644 --- a/test/ete/labs/huawei/onap-openstack-template.env +++ b/test/ete/labs/huawei/onap-openstack-template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: m1.xlarge - flavor_xxlarge: m1.2xlarge - vm_base_name: onap key_name: onap_key @@ -54,8 +52,6 @@ parameters: openstack_region: RegionOne - horizon_url: http://10.145.122.117/horizon - keystone_url: http://10.145.122.117:5000 cloud_env: RegionOne diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env index a75438f7a..b92221f43 100644 --- a/test/ete/labs/tlab/onap-openstack-template.env +++ b/test/ete/labs/tlab/onap-openstack-template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: m1.xlarge - flavor_xxlarge: m1.xlarge - vm_base_name: onap key_name: onap_key @@ -54,8 +52,6 @@ parameters: openstack_region: RegionOne - horizon_url: https://bdc1tlab01.research.att.com/horizon - keystone_url: https://bdc1tlab01.research.att.com:5000 cloud_env: openstack diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index 1dbcbc4f6..f094f65a9 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: m1.xlarge - flavor_xxlarge: m1.xxlarge - vm_base_name: onap key_name: onap_key @@ -54,8 +52,6 @@ parameters: openstack_region: RegionOne - horizon_url: http://10.12.25.2/horizon - keystone_url: http://10.12.25.2:5000 cloud_env: openstack -- cgit 1.2.3-korg From 8ad02133363dfb9ae2582bf73e1215322125d824 Mon Sep 17 00:00:00 2001 From: Pawel Kadlubanski Date: Thu, 24 May 2018 12:30:11 +0200 Subject: Add docker hub address. Issue-ID: INT-458 Change-Id: I850fff4b7c7caf25fcc315f2e7b7408d2bb13993 Signed-off-by: Pawel Kadlubanski --- test/mocks/pnfsimulator/simulator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/mocks/pnfsimulator/simulator.sh b/test/mocks/pnfsimulator/simulator.sh index 27384dd04..5e8b2d5ac 100755 --- a/test/mocks/pnfsimulator/simulator.sh +++ b/test/mocks/pnfsimulator/simulator.sh @@ -4,7 +4,7 @@ set -euo pipefail CONTAINER_NAME=pnf-simulator CONFIG_FILE_PATH=/config/body.json -SIMULATOR_DOCKER_HUB=hub-name +SIMULATOR_DOCKER_HUB=nexus3.onap.org:10003/onap SIMULATOR_TAG=latest function main(){ -- cgit 1.2.3-korg From a50b911ad18155bc6d77d7260e83d5178b456957 Mon Sep 17 00:00:00 2001 From: Mariusz Wagner Date: Thu, 24 May 2018 14:14:39 +0200 Subject: Initial commit with robotframework Robotframework python files to be used in tests. At this moment it tests nothing Issue-ID: INT-510 Change-Id: Icbd6a6ffcbdb28755b26cad3a2b8c6d163f77c38 Signed-off-by: Mariusz Wagner --- .../tests/dcaegen2/prh_testcases/__init__.robot | 0 .../assets/json_events/pnf_ready.json | 6 ++ .../prh_testcases/assets/json_events/response.json | 33 ++++++++ test/csit/tests/dcaegen2/prh_testcases/prh.robot | 19 +++++ .../dcaegen2/prh_testcases/resources/PrhLibrary.py | 95 ++++++++++++++++++++++ .../prh_testcases/resources/PrhVariables.py | 18 ++++ .../dcaegen2/prh_testcases/resources/Simulator.py | 91 +++++++++++++++++++++ .../prh_testcases/resources/prh_keywords.robot | 61 ++++++++++++++ 8 files changed, 323 insertions(+) create mode 100644 test/csit/tests/dcaegen2/prh_testcases/__init__.robot create mode 100644 test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json create mode 100644 test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json create mode 100644 test/csit/tests/dcaegen2/prh_testcases/prh.robot create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot diff --git a/test/csit/tests/dcaegen2/prh_testcases/__init__.robot b/test/csit/tests/dcaegen2/prh_testcases/__init__.robot new file mode 100644 index 000000000..e69de29bb diff --git a/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json new file mode 100644 index 000000000..d340709c9 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json @@ -0,0 +1,6 @@ +{"event": + {"correlationID":"NOKQTFCOC540002E", + "pnfOamIpv4Address":"10.16.123.234", + "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334" + } +} diff --git a/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json new file mode 100644 index 000000000..39c76df95 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json @@ -0,0 +1,33 @@ +{"event": + {"commonEventHeader": + {"sourceId":"QTFCOC540002E", + "startEpochMicrosec":1519837825682, + "eventId":"QTFCOC540002E-reg", + "nfcNamingCode":"5DU", + "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, + "eventType":"pnfRegistration", + "priority":"Normal", + "version":3, + "reportingEntityName":"5GRAN_DU", + "sequence":0, + "domain":"other", + "lastEpochMicrosec":1519837825682, + "eventName":"pnfRegistration_5GDU", + "sourceName":"5GRAN_DU", + "nfNamingCode":"5GRAN" + }, + "otherFields": + {"pnfLastServiceDate":1517206400, + "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", + "pnfVendorName":"Nokia", + "pnfModelNumber":"AJ02", + "pnfFamily":"BBU", + "pnfType":"AirScale", + "otherFieldsVersion":1, + "pnfOamIpv4Address":"10.16.123.234", + "pnfSoftwareVersion":"v4.5.0.1", + "pnfSerialNumber":"QTFCOC540002E", + "pnfManufactureDate":1516406400 + } + } +} diff --git a/test/csit/tests/dcaegen2/prh_testcases/prh.robot b/test/csit/tests/dcaegen2/prh_testcases/prh.robot new file mode 100644 index 000000000..7c9b9533f --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/prh.robot @@ -0,0 +1,19 @@ +*** Settings *** +Documentation Testing PRH with various use scenarios +Suite Setup PRH Suite Setup +Suite Teardown PRH Suite Shutdown +Library Collections +Library resources/PrhLibrary.py +Resource resources/prh_keywords.robot + +*** Variables *** +${DMaaP_URL} http://localhost:3904 +${AAI_URL} http://localhost:3905 +${PNF_READY} %{WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json + +*** Test Cases *** +New test + [Documentation] First positive TC + [Tags] PRH + #First TC will be added after initial commit + Should Be True True diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py new file mode 100644 index 000000000..893ed9460 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py @@ -0,0 +1,95 @@ +''' +Created on Apr 27, 2018 + +@author: mwagner9 +''' + +import threading +import time + +from robot.api import logger + +import PrhVariables +import Simulator + +st = '{"event":{"correlationID":"NOKQTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}' + +class PrhLibrary(object): + def __init__(self): + pass + + def setup_dmaap_server(self): + return _setup(PrhVariables.DMaaPHttpServerThread, 'DMaaP', PrhVariables.DMaaPIsRobotRun, Simulator, 3904) + + def setup_aai_server(self): + return _setup(PrhVariables.AAIHttpServerThread, 'AAI', PrhVariables.AAIIsRobotRun, Simulator, 3905) + + def shutdown_dmaap_server(self): + return _shutdown(PrhVariables.DMaaPHTTPD, 'DMaaP') + + def shutdown_aai_server(self): + return _shutdown(PrhVariables.AAIHTTPD, 'AAI') + + def is_json_empty(self, response): + logger.info("Enter is_json_empty: response.text: " + response.text) + if response.text is None or len(response.text) < 2: + return 'True' + return 'False' + + def dmaap_collectorTimeStamp_receive(self, search, response): + return _find_element(search, response) + + def AAI_Ipv4_receive(self, search, response): + return _find_element(search, response) + + def AAI_Ipv6_receive(self, search, response): + return _find_element(search, response) + + def check_pnf_ready(self): + if st in Simulator.prh_ready: + return 'true' + return 'false' + +def _setup(serverthread, servername, isrobotrun, module, portNum): + if serverthread is not None: + logger.console('{} Mockup Sever started'.format(servername)) + return "true" + + isrobotrun = True + + module_handler = module.AAIHandler if servername is 'AAI' else module.DMaaPHandler + + module.run_server(module_handler, portNum) + try: + serverthread = threading.Thread(name='{}_HTTPServer'.format(servername), target=module.Httpd.serve_forever) + serverthread.start() + logger.console('{} Mockup Sever started'.format(servername)) + time.sleep(2) + return "true" + except Exception as e: + print (str(e)) + return "false" + +def _shutdown(server, name): + if server is not None: + server.shutdown() + logger.console("{} Server shut down".format(name)) + time.sleep(3) + return "true" + else: + return "false" + +def _find_element(search, response): + while response is not None: + json_data = str(response) + if search in json_data: + return 'true' + return 'false' + +if __name__ == '__main__': + lib = PrhLibrary() + ret = lib.setup_dmaap_server() + print ret + ret = lib.setup_aai_server() + print ret + time.sleep(10) diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py new file mode 100644 index 000000000..882a4b9ce --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py @@ -0,0 +1,18 @@ +''' +Created on Apr 27, 2018 + +@author: mwagner9 +''' + +import os + +def GetEnvironmentVariable(envVarstr): + return os.environ.get(envVarstr) + +DMaaPHttpServerThread = None +DMaaPHTTPD = None +DMaaPIsRobotRun = False + +AAIHttpServerThread = None +AAIHTTPD = None +AAIIsRobotRun = False diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py b/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py new file mode 100644 index 000000000..e746d5a48 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py @@ -0,0 +1,91 @@ +''' +Created on May 10, 2018 + +@author: mwagner9 +''' + +import BaseHTTPServer +import re +import sys + +from robot.api import logger + +import PrhVariables + +Httpd = None +prh_ready = '' + +class BaseHandler(BaseHTTPServer.BaseHTTPRequestHandler, object): + def do_GET(self, param1, param2): + """Serve a GET request.""" + #prepare GET response + logger.console(self.raw_requestlinel) + json_string = param1 + if re.search(param2, self.path) is not None: + self.send_response(200) + self.send_header("Content-type", "application/json") + self.end_headers() + self.wfile.write(json_string) + +class AAIHandler(BaseHandler): + def do_PATCH(self): + #prepare PATCH response + logger.console('========') + logger.console(self.raw_requestline) + logger.console('========') + if re.search('/aai/v12/network/pnfs/pnf/NOKQTFCOC540002E', self.path)is not None: + st = '{"ipaddress-v6-oam": "2001:0db8:85a3:0000:0000:8a2e:0370:7334","ipaddress-v4-oam": "11.22.33.156"}' + logger.console('========') + logger.console(self.raw_requestline) + logger.console('========') + self.send_response(200) + + def do_GET(self): + param1 = '{"pnf-name":"NOKQTFCOC540002E", "pnf-id":"NOKQTFCOC540002E","ipaddress-v4-oam":"10.16.123.234","ipaddress-v6-oam":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}' + param2 = '/aai/v12/network/pnfs/pnf/NOKQTFCOC540002E' + super(self.__class__, self).do_GET(param1, param2) + +class DMaaPHandler(BaseHandler): + def do_GET(self): + param1 = '{"event": {"commonEventHeader": {"sourceId":"QTFCOC540002E", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC540002E-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", "pnfVendorName":"Nokia", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"10.16.123.234", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC540002E", "pnfManufactureDate":1516406400}}}' + param2 = '/events/unauthenticated.SEC_OTHER_OUTPUT/OpenDCAE-c12/c12' + super(self.__class__, self).do_GET(param1, param2) + + def do_POST(self): + #Prepare POST response + logger.console('========') + logger.console(self.raw_requestline) + logger.console('========') + if re.search('/events/unauthenticated.PNF_READY', self.path) is not None: + global prh_ready + prh_ready = '{"event":{"correlationID":"NOKQTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}' + self.send_response(200) + +def run_server(HandlerClass, port, ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): + server_address = ('', port) + + HandlerClass.protocol_version = protocol + httpd = ServerClass(server_address, HandlerClass) + + global Httpd + Httpd = httpd + if HandlerClass is DMaaPHandler: + PrhVariables.DMaaPHTTPD = httpd + else: + PrhVariables.AAIHTTPD = httpd + + sa = httpd.socket.getsockname() + print "Serving HTTP on", sa[0], "port", sa[1], "..." + +def _main_ (HandlerClass, port, ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): + server_address = ('', port) + + HandlerClass.protocol_version = protocol + httpd = ServerClass(server_address, HandlerClass) + + sa = httpd.socket.getsockname() + print "Serving HTTP on", sa[0], "port", sa[1], "..." + httpd.serve_forever() + +if __name__ == '__main__': + _main_(DMaaPHandler, 3904) diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot b/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot new file mode 100644 index 000000000..1595cd4a4 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot @@ -0,0 +1,61 @@ +*** Settings *** +Documentation The main interface for interacting with PRH. It handles low level stuff like managing the http request library +Library PrhLibrary.py +Library RequestsLibrary + +*** Variables *** + +*** Keywords *** +PRH Suite Setup + [Documentation] Start DMaaP and AAI Mockup Server + ${ret}= Setup DMaaP Server + Should Be Equal As Strings ${ret} true + ${ret}= Setup AAI Server + Should Be Equal As Strings ${ret} true + +PRH Suite Shutdown + [Documentation] Shutdown DMaaP and AAI Mockup Server + ${ret}= Shutdown DMaap Server + Should Be Equal As Strings ${ret} true + ${ret}= Shutdown AAI Server + Should Be Equal As Strings ${ret} true + +Get event from DMaaP + [Arguments] ${ip} ${endpoint} + [Documentation] Get an event from DMaaP + ${url}= Catenate SEPARATOR= ${ip} ${endpoint} + Log Creating session ${url} + Create Session prh-d1 ${url} + ${resp}= Get Request prh-d1 ${url} + Log Received response from dcae ${resp.json()} + [Return] ${resp} + +Send patch from AAI + [Arguments] ${ip} ${endpoint} + [Documentation] Get patch from AAI + ${url}= Catenate SEPARATOR= ${ip} ${endpoint} + Log Creating session ${url} + Create Session prh-d1 ${url} + ${resp}= Patch Request prh-d1 ${url} + Log ${resp} + [Return] ${resp} + +Get json from AAI + [Arguments] ${ip} ${endpoint} + [Documentation] Get json from AAI + ${url}= Catenate SEPARATOR= ${ip} ${endpoint} + Log Creating session ${url} + Create Session prh-d1 ${url} + ${resp}= Get Request prh-d1 ${url} + Log Received response from dcae ${resp.json()} + [Return] ${resp} + +Post json to DMaaP + [Arguments] ${ip} ${endpoint} ${PNF_READY} + [Documentation] Get json from AAI + ${url}= Catenate SEPARATOR= ${ip} ${endpoint} + Log Creating session ${url} + Create Session prh-d1 ${url} + ${resp}= Post Request prh-d1 ${url} data=${PNF_READY} + Log ${resp} + [Return] ${resp} -- cgit 1.2.3-korg From d015316290cfe88db8bba720dc2d574a27fec037 Mon Sep 17 00:00:00 2001 From: Aaron Hay Date: Thu, 24 May 2018 13:11:50 -0400 Subject: Update APPC CSIT credentials for robot test cases Change-Id: I67c401b36915b7f1812f7b590322e656c0b5becd Issue-ID: INT-512 Signed-off-by: Aaron Hay --- test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot | 4 ++-- test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot | 4 ++-- test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot b/test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot index 2259f3f69..cfba50b8d 100644 --- a/test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot +++ b/test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot @@ -14,7 +14,7 @@ ${var} APPC LCM API HEALTHCHECK [Documentation] APPC LCM API HEALTHCHECK Start Virtual Display 1920 1080 - Open Browser http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@localhost:8282/apidoc/explorer/index.html chrome + Open Browser http://admin:admin@localhost:8282/apidoc/explorer/index.html chrome Maximize Browser Window # Click Element xpath=.//p[contains(text(),'If you have reason to expect the website is safe, select the I Accept the Risk button to continue.')]//following::img @@ -49,4 +49,4 @@ APPC LCM API HEALTHCHECK Tear Down [Documentation] Close all browsers - Close All Browsers \ No newline at end of file + Close All Browsers diff --git a/test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot b/test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot index 768865f92..98a8e584c 100644 --- a/test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot +++ b/test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot @@ -13,7 +13,7 @@ ${var} APPC LCM API VM RESTART [Documentation] APPC LCM API VM RESTART Start Virtual Display 1920 1080 - Open Browser http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@localhost:8282/apidoc/explorer/index.html chrome + Open Browser http://admin:admin@localhost:8282/apidoc/explorer/index.html chrome Maximize Browser Window # Click Element xpath=.//p[contains(text(),'If you have reason to expect the website is safe, select the I Accept the Risk button to continue.')]//following::img @@ -44,4 +44,4 @@ APPC LCM API VM RESTART Tear Down [Documentation] Close all browsers - Close All Browsers \ No newline at end of file + Close All Browsers diff --git a/test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot b/test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot index 15690f023..0f550d343 100644 --- a/test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot +++ b/test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot @@ -16,7 +16,7 @@ ${var} APPC LCM API VNF RESTART [Documentation] APPC LCM API VNF RESTART Start Virtual Display 1920 1080 - Open Browser http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@localhost:8282/apidoc/explorer/index.html chrome + Open Browser http://admin:admin@localhost:8282/apidoc/explorer/index.html chrome Maximize Browser Window # Click Element xpath=.//p[contains(text(),'If you have reason to expect the website is safe, select the I Accept the Risk button to continue.')]//following::img @@ -47,4 +47,4 @@ APPC LCM API VNF RESTART Tear Down [Documentation] Close all browsers - Close All Browsers \ No newline at end of file + Close All Browsers -- cgit 1.2.3-korg From d3337f0bbd8394e2a28f812060549c2645e42825 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 24 May 2018 10:51:23 -0700 Subject: Bug fix on OOM deploy script Change-Id: I522ef73697f67e78be31d7b971853025e8028f97 Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/scripts/deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index 134ba6bdc..3dbc0894d 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -52,9 +52,10 @@ if ! timeout 1 ping -c 1 "$RANCHER_IP"; then exit 2 fi +ssh-keygen -R $RANCHER_IP + ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)" -ssh-keygen -R $RANCHER_IP for n in $(seq 1 6); do timeout 15m ssh -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' RESULT=$? -- cgit 1.2.3-korg From 708a2f7ad7ee5732b85cf966df338b64cae85d10 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 24 May 2018 11:00:47 -0700 Subject: Clean up deprecated DCAE parameters from R2 Change-Id: I602d97ee6c1e5b2f0efddf948bf9f75f5249729b Issue-ID: DCAEGEN2-499 Signed-off-by: Gary Wu --- test/ete/labs/gwu/onap-openstack-template.env | 37 --------------------- test/ete/labs/huawei/onap-openstack-template.env | 38 +--------------------- test/ete/labs/tlab/onap-openstack-template.env | 37 --------------------- .../ete/labs/windriver/onap-openstack-template.env | 37 --------------------- 4 files changed, 1 insertion(+), 148 deletions(-) diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env index c2ef4034a..ea061e6a0 100644 --- a/test/ete/labs/gwu/onap-openstack-template.env +++ b/test/ete/labs/gwu/onap-openstack-template.env @@ -98,43 +98,6 @@ parameters: ########################### dcae_deployment_profile: R2MVP - dnsaas_config_enabled: false - dnsaas_region: RegionOne - dnsaas_keystone_url: http://192.168.1.11:5000/v3 - dnsaas_tenant_name: ${OS_PROJECT_NAME} - dnsaas_username: ${OS_USERNAME} - dnsaas_password: ${OS_PASSWORD} - dcae_keystone_url: http://192.168.1.11:5000/v2.0 - dcae_centos_7_image: centos7 - dcae_domain: dcaeg2.onap.org - dcae_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - dcae_private_key: '-----BEGIN RSA PRIVATE KEY-----\n -MIIEpQIBAAKCAQEAylw4KKN/ljqnFBvP+blG5PNfsnM4MAuGPMsE5rkKmzcZWNaE\n -NGMXTFKlJ4YrUl7OUv8kbgFTmB8BoNpgrNtKACDaz/psQSOeOADCG/YrT4wrYKrR\n -NhFqOjJpxRmxweEsd14qBOxeFT7Ie42qbCMMzo260HvjLmtUxkOXeJ3xDkGmoJVy\n -yzxX7nO1m4WyWyukO6x6mX0XDsADF4A6AapcqinoisJ7pnXaNkcjU/JY2Jrwem7s\n -+ypzIp86O6gdLpLVU9ORR/UYNAk1h+Z6K5Rual4D9mrpC9IJNaYfIgLe7mC39ZLa\n -fiySNoGhei9P6pYvRJlQki69bid/EPAgX5YZIQIDAQABAoIBAQClDekkhI9ZqseC\n -qFjPuKaxsizZMg+faJb6WSHLSxzyk1OSWY6F6FklgLeC8HW/fuLNYZyGOYDEsG20\n -lMqL02Wdiy7OutS3oOS5iyzIf9a90HfFJi706el6RIpvINETcaXCS0T8tQrcS1Rd\n -KqTaBRC6HXJGAPbBcvw3pwQSdskatU6a/Kt2a3x6DsqqinQcgEB/SbrDaJCUX9sb\n -F2HVUwdq7aZK1Lk0ozr1FID9mrhjwWuQ6XC+vjG0FqtyXeMpR5iaQ73hex3FXQ8z\n -OjkFbMwuHWSh1DSx70r5yFrrBqwQKnMsBqx4QDRf3fIENUnWviaL+n+gwcXA07af\n -4kaNUFUtAoGBAPuNNRAGhZnyZ9zguns9PM56nmeMUikV5dPN2DTbQb79cpfV+7pC\n -6PeSH/dTKFLz62d6qAM2EsNXQvewf8fipBVBRPsRqKOv+uepd01dHNy62I5B+zRm\n -be9Kbe+EN60qdzvyPM+2hV6CnvGv1dirimS9pu6RrxD2Rmz1ectnJE+rAoGBAM3w\n -UbSEemyZ6EKjck2RfdipzY0MNBnIZ2cUqHh8mmPXjdTLzpXb9vmPbHb01Qwo8MP+\n -gMnTbTBOzyNAaHdIrCO9FHW6C85j3ot5Yzcr+EcBVcua+7KHU0Sgn44JNH8DisJ7\n -Y63UP/1Xb4d1/QvHfxYy3WOvvRdVZ7pPo8JNX95jAoGAIe5CIg8/JizUZa7KeKUh\n -9pgDleQPkQsrHQ6/AyIwFBsLwf9THSS5V+uV9D57SfUs46Bf2U8J6N90YQSlt8iS\n -aWuManFPVgT+yxDIzt6obf2mCEpOIBtQ6N4ZRh2HhQwdWTCrkzkDdGQaHG+jYL6C\n -xGPwiG2ON7OAfGIAM7eN5lECgYEAhoRLWlaOgRGnHKAWsYQvZ67CjTdDcPPuVu6v\n -fMQnNMA/7JeTwV+E205L0wfpgZ/cZKmBBlQMJlnUA3q2wfO+PTnse1mjDJU/cGtB\n -22/lJLxChlQdxGeQhGtGzUhF+hEeOhrO6WSSx7CtMRZoy6Dr6lwfMFZCdVNcBd6v\n -YOOZk3ECgYEAseUKGb6E80XTVVNziyuiVbQCsI0ZJuRfqMZ2IIDQJU9u6AnGAway\n -itqHbkGsmDT+4HUz01+1JKnnw42RdSrHdU/LaOonD+RIGqe2x800QXzqASKLdCXr\n -y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=\n ------END RSA PRIVATE KEY-----' ################################ # # diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env index 900b08789..a14eeecc5 100644 --- a/test/ete/labs/huawei/onap-openstack-template.env +++ b/test/ete/labs/huawei/onap-openstack-template.env @@ -92,43 +92,7 @@ parameters: # # ########################### - dnsaas_config_enabled: false - dnsaas_region: RegionOne - dnsaas_keystone_url: http://10.145.122.117:5000/v3 - dnsaas_tenant_name: ${OS_PROJECT_NAME} - dnsaas_username: ${OS_USERNAME} - dnsaas_password: ${OS_PASSWORD} - dcae_keystone_url: http://10.145.122.117:5000/v2.0 - dcae_centos_7_image: centos7 - dcae_domain: dcaeg2.onap.org - dcae_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - dcae_private_key: '-----BEGIN RSA PRIVATE KEY-----\n -MIIEpQIBAAKCAQEAylw4KKN/ljqnFBvP+blG5PNfsnM4MAuGPMsE5rkKmzcZWNaE\n -NGMXTFKlJ4YrUl7OUv8kbgFTmB8BoNpgrNtKACDaz/psQSOeOADCG/YrT4wrYKrR\n -NhFqOjJpxRmxweEsd14qBOxeFT7Ie42qbCMMzo260HvjLmtUxkOXeJ3xDkGmoJVy\n -yzxX7nO1m4WyWyukO6x6mX0XDsADF4A6AapcqinoisJ7pnXaNkcjU/JY2Jrwem7s\n -+ypzIp86O6gdLpLVU9ORR/UYNAk1h+Z6K5Rual4D9mrpC9IJNaYfIgLe7mC39ZLa\n -fiySNoGhei9P6pYvRJlQki69bid/EPAgX5YZIQIDAQABAoIBAQClDekkhI9ZqseC\n -qFjPuKaxsizZMg+faJb6WSHLSxzyk1OSWY6F6FklgLeC8HW/fuLNYZyGOYDEsG20\n -lMqL02Wdiy7OutS3oOS5iyzIf9a90HfFJi706el6RIpvINETcaXCS0T8tQrcS1Rd\n -KqTaBRC6HXJGAPbBcvw3pwQSdskatU6a/Kt2a3x6DsqqinQcgEB/SbrDaJCUX9sb\n -F2HVUwdq7aZK1Lk0ozr1FID9mrhjwWuQ6XC+vjG0FqtyXeMpR5iaQ73hex3FXQ8z\n -OjkFbMwuHWSh1DSx70r5yFrrBqwQKnMsBqx4QDRf3fIENUnWviaL+n+gwcXA07af\n -4kaNUFUtAoGBAPuNNRAGhZnyZ9zguns9PM56nmeMUikV5dPN2DTbQb79cpfV+7pC\n -6PeSH/dTKFLz62d6qAM2EsNXQvewf8fipBVBRPsRqKOv+uepd01dHNy62I5B+zRm\n -be9Kbe+EN60qdzvyPM+2hV6CnvGv1dirimS9pu6RrxD2Rmz1ectnJE+rAoGBAM3w\n -UbSEemyZ6EKjck2RfdipzY0MNBnIZ2cUqHh8mmPXjdTLzpXb9vmPbHb01Qwo8MP+\n -gMnTbTBOzyNAaHdIrCO9FHW6C85j3ot5Yzcr+EcBVcua+7KHU0Sgn44JNH8DisJ7\n -Y63UP/1Xb4d1/QvHfxYy3WOvvRdVZ7pPo8JNX95jAoGAIe5CIg8/JizUZa7KeKUh\n -9pgDleQPkQsrHQ6/AyIwFBsLwf9THSS5V+uV9D57SfUs46Bf2U8J6N90YQSlt8iS\n -aWuManFPVgT+yxDIzt6obf2mCEpOIBtQ6N4ZRh2HhQwdWTCrkzkDdGQaHG+jYL6C\n -xGPwiG2ON7OAfGIAM7eN5lECgYEAhoRLWlaOgRGnHKAWsYQvZ67CjTdDcPPuVu6v\n -fMQnNMA/7JeTwV+E205L0wfpgZ/cZKmBBlQMJlnUA3q2wfO+PTnse1mjDJU/cGtB\n -22/lJLxChlQdxGeQhGtGzUhF+hEeOhrO6WSSx7CtMRZoy6Dr6lwfMFZCdVNcBd6v\n -YOOZk3ECgYEAseUKGb6E80XTVVNziyuiVbQCsI0ZJuRfqMZ2IIDQJU9u6AnGAway\n -itqHbkGsmDT+4HUz01+1JKnnw42RdSrHdU/LaOonD+RIGqe2x800QXzqASKLdCXr\n -y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=\n ------END RSA PRIVATE KEY-----' + dcae_deployment_profile: R2MVP ################################ # # diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env index b92221f43..690311863 100644 --- a/test/ete/labs/tlab/onap-openstack-template.env +++ b/test/ete/labs/tlab/onap-openstack-template.env @@ -99,43 +99,6 @@ parameters: ########################### dcae_deployment_profile: R2MVP - dnsaas_config_enabled: false - dnsaas_region: RegionOne - dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000/v3 - dnsaas_tenant_name: ${OS_PROJECT_NAME} - dnsaas_username: ${OS_USERNAME} - dnsaas_password: ${OS_PASSWORD} - dcae_keystone_url: "https://bdc1tlab01.research.att.com:5000/v3" - dcae_centos_7_image: "centos7" - dcae_domain: dcaeg2.onap.org - dcae_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - dcae_private_key: '-----BEGIN RSA PRIVATE KEY-----\n -MIIEpQIBAAKCAQEAylw4KKN/ljqnFBvP+blG5PNfsnM4MAuGPMsE5rkKmzcZWNaE\n -NGMXTFKlJ4YrUl7OUv8kbgFTmB8BoNpgrNtKACDaz/psQSOeOADCG/YrT4wrYKrR\n -NhFqOjJpxRmxweEsd14qBOxeFT7Ie42qbCMMzo260HvjLmtUxkOXeJ3xDkGmoJVy\n -yzxX7nO1m4WyWyukO6x6mX0XDsADF4A6AapcqinoisJ7pnXaNkcjU/JY2Jrwem7s\n -+ypzIp86O6gdLpLVU9ORR/UYNAk1h+Z6K5Rual4D9mrpC9IJNaYfIgLe7mC39ZLa\n -fiySNoGhei9P6pYvRJlQki69bid/EPAgX5YZIQIDAQABAoIBAQClDekkhI9ZqseC\n -qFjPuKaxsizZMg+faJb6WSHLSxzyk1OSWY6F6FklgLeC8HW/fuLNYZyGOYDEsG20\n -lMqL02Wdiy7OutS3oOS5iyzIf9a90HfFJi706el6RIpvINETcaXCS0T8tQrcS1Rd\n -KqTaBRC6HXJGAPbBcvw3pwQSdskatU6a/Kt2a3x6DsqqinQcgEB/SbrDaJCUX9sb\n -F2HVUwdq7aZK1Lk0ozr1FID9mrhjwWuQ6XC+vjG0FqtyXeMpR5iaQ73hex3FXQ8z\n -OjkFbMwuHWSh1DSx70r5yFrrBqwQKnMsBqx4QDRf3fIENUnWviaL+n+gwcXA07af\n -4kaNUFUtAoGBAPuNNRAGhZnyZ9zguns9PM56nmeMUikV5dPN2DTbQb79cpfV+7pC\n -6PeSH/dTKFLz62d6qAM2EsNXQvewf8fipBVBRPsRqKOv+uepd01dHNy62I5B+zRm\n -be9Kbe+EN60qdzvyPM+2hV6CnvGv1dirimS9pu6RrxD2Rmz1ectnJE+rAoGBAM3w\n -UbSEemyZ6EKjck2RfdipzY0MNBnIZ2cUqHh8mmPXjdTLzpXb9vmPbHb01Qwo8MP+\n -gMnTbTBOzyNAaHdIrCO9FHW6C85j3ot5Yzcr+EcBVcua+7KHU0Sgn44JNH8DisJ7\n -Y63UP/1Xb4d1/QvHfxYy3WOvvRdVZ7pPo8JNX95jAoGAIe5CIg8/JizUZa7KeKUh\n -9pgDleQPkQsrHQ6/AyIwFBsLwf9THSS5V+uV9D57SfUs46Bf2U8J6N90YQSlt8iS\n -aWuManFPVgT+yxDIzt6obf2mCEpOIBtQ6N4ZRh2HhQwdWTCrkzkDdGQaHG+jYL6C\n -xGPwiG2ON7OAfGIAM7eN5lECgYEAhoRLWlaOgRGnHKAWsYQvZ67CjTdDcPPuVu6v\n -fMQnNMA/7JeTwV+E205L0wfpgZ/cZKmBBlQMJlnUA3q2wfO+PTnse1mjDJU/cGtB\n -22/lJLxChlQdxGeQhGtGzUhF+hEeOhrO6WSSx7CtMRZoy6Dr6lwfMFZCdVNcBd6v\n -YOOZk3ECgYEAseUKGb6E80XTVVNziyuiVbQCsI0ZJuRfqMZ2IIDQJU9u6AnGAway\n -itqHbkGsmDT+4HUz01+1JKnnw42RdSrHdU/LaOonD+RIGqe2x800QXzqASKLdCXr\n -y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=\n ------END RSA PRIVATE KEY-----' ################################ # # diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index f094f65a9..6cd3b7d0a 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -98,43 +98,6 @@ parameters: ########################### dcae_deployment_profile: R2MVP - dnsaas_config_enabled: true - dnsaas_region: RegionOne - dnsaas_keystone_url: http://10.12.25.5:5000/v3 - dnsaas_tenant_name: ${OS_PROJECT_NAME} - dnsaas_username: ${OS_USERNAME} - dnsaas_password: ${OS_PASSWORD} - dcae_keystone_url: "http://10.0.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0" - dcae_centos_7_image: CentOS-7 - dcae_domain: dcaeg2.onap.org - dcae_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - dcae_private_key: '-----BEGIN RSA PRIVATE KEY-----\n -MIIEpQIBAAKCAQEAylw4KKN/ljqnFBvP+blG5PNfsnM4MAuGPMsE5rkKmzcZWNaE\n -NGMXTFKlJ4YrUl7OUv8kbgFTmB8BoNpgrNtKACDaz/psQSOeOADCG/YrT4wrYKrR\n -NhFqOjJpxRmxweEsd14qBOxeFT7Ie42qbCMMzo260HvjLmtUxkOXeJ3xDkGmoJVy\n -yzxX7nO1m4WyWyukO6x6mX0XDsADF4A6AapcqinoisJ7pnXaNkcjU/JY2Jrwem7s\n -+ypzIp86O6gdLpLVU9ORR/UYNAk1h+Z6K5Rual4D9mrpC9IJNaYfIgLe7mC39ZLa\n -fiySNoGhei9P6pYvRJlQki69bid/EPAgX5YZIQIDAQABAoIBAQClDekkhI9ZqseC\n -qFjPuKaxsizZMg+faJb6WSHLSxzyk1OSWY6F6FklgLeC8HW/fuLNYZyGOYDEsG20\n -lMqL02Wdiy7OutS3oOS5iyzIf9a90HfFJi706el6RIpvINETcaXCS0T8tQrcS1Rd\n -KqTaBRC6HXJGAPbBcvw3pwQSdskatU6a/Kt2a3x6DsqqinQcgEB/SbrDaJCUX9sb\n -F2HVUwdq7aZK1Lk0ozr1FID9mrhjwWuQ6XC+vjG0FqtyXeMpR5iaQ73hex3FXQ8z\n -OjkFbMwuHWSh1DSx70r5yFrrBqwQKnMsBqx4QDRf3fIENUnWviaL+n+gwcXA07af\n -4kaNUFUtAoGBAPuNNRAGhZnyZ9zguns9PM56nmeMUikV5dPN2DTbQb79cpfV+7pC\n -6PeSH/dTKFLz62d6qAM2EsNXQvewf8fipBVBRPsRqKOv+uepd01dHNy62I5B+zRm\n -be9Kbe+EN60qdzvyPM+2hV6CnvGv1dirimS9pu6RrxD2Rmz1ectnJE+rAoGBAM3w\n -UbSEemyZ6EKjck2RfdipzY0MNBnIZ2cUqHh8mmPXjdTLzpXb9vmPbHb01Qwo8MP+\n -gMnTbTBOzyNAaHdIrCO9FHW6C85j3ot5Yzcr+EcBVcua+7KHU0Sgn44JNH8DisJ7\n -Y63UP/1Xb4d1/QvHfxYy3WOvvRdVZ7pPo8JNX95jAoGAIe5CIg8/JizUZa7KeKUh\n -9pgDleQPkQsrHQ6/AyIwFBsLwf9THSS5V+uV9D57SfUs46Bf2U8J6N90YQSlt8iS\n -aWuManFPVgT+yxDIzt6obf2mCEpOIBtQ6N4ZRh2HhQwdWTCrkzkDdGQaHG+jYL6C\n -xGPwiG2ON7OAfGIAM7eN5lECgYEAhoRLWlaOgRGnHKAWsYQvZ67CjTdDcPPuVu6v\n -fMQnNMA/7JeTwV+E205L0wfpgZ/cZKmBBlQMJlnUA3q2wfO+PTnse1mjDJU/cGtB\n -22/lJLxChlQdxGeQhGtGzUhF+hEeOhrO6WSSx7CtMRZoy6Dr6lwfMFZCdVNcBd6v\n -YOOZk3ECgYEAseUKGb6E80XTVVNziyuiVbQCsI0ZJuRfqMZ2IIDQJU9u6AnGAway\n -itqHbkGsmDT+4HUz01+1JKnnw42RdSrHdU/LaOonD+RIGqe2x800QXzqASKLdCXr\n -y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=\n ------END RSA PRIVATE KEY-----' ################################ # # -- cgit 1.2.3-korg From 0d28fe6e20d46380a25ac7e17a01b11cabe63db4 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 24 May 2018 20:54:28 -0700 Subject: Bug fix on OOM deploy script Change-Id: I869f9eeb112f0b9516dc0c33874a26f35684a156 Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/scripts/deploy.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index 3dbc0894d..98ba2bd6a 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -10,6 +10,8 @@ if [ "$#" -ne 1 ]; then fi ENV_FILE=$1 +SSH_KEY=~/.ssh/onap_key + source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f @@ -54,17 +56,17 @@ fi ssh-keygen -R $RANCHER_IP -ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)" +ssh -o StrictHostKeychecking=no -i $SSH_KEY ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)" for n in $(seq 1 6); do - timeout 15m ssh -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' + timeout 15m ssh -i $SSH_KEY ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' RESULT=$? if [ $RESULT -eq 0 ]; then break fi sleep 15m done -ROBOT_POD=$(ssh -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') +ROBOT_POD=$(ssh -i $SSH_KEY ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') if [ "$ROBOT_POD" == "" ]; then exit 1 fi -- cgit 1.2.3-korg From 060bc42881341b5b6259bc43895ab1ab5626189c Mon Sep 17 00:00:00 2001 From: wejs Date: Fri, 25 May 2018 13:58:11 +0200 Subject: Initial testcase with docker-compose for PRH Test without usage of previously committed robotframework. To be done later on. Now just to check whether it works with CI. Change-Id: I94ae148e727db3820cf7eb93ba2a4286d176bfbc Issue-ID: INT-510 Signed-off-by: wejs --- test/csit/plans/dcaegen2/prh_testsuites/setup.sh | 50 + .../csit/plans/dcaegen2/prh_testsuites/teardown.sh | 19 + .../plans/dcaegen2/prh_testsuites/testplan.txt | 3 + .../tests/dcaegen2/prh_testcases/prh_tests.robot | 48 + .../resources/CommonEventFormat_28.3.json | 1866 ++++++++++++++++++++ .../dcaegen2/prh_testcases/resources/DMaaP.py | 157 ++ .../dcaegen2/prh_testcases/resources/Dockerfile | 13 + .../prh_testcases/resources/docker-compose.yml | 29 + .../resources/events/pnf_register_event.json | 1 + 9 files changed, 2186 insertions(+) create mode 100644 test/csit/plans/dcaegen2/prh_testsuites/setup.sh create mode 100644 test/csit/plans/dcaegen2/prh_testsuites/teardown.sh create mode 100644 test/csit/plans/dcaegen2/prh_testsuites/testplan.txt create mode 100644 test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/CommonEventFormat_28.3.json create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/DMaaP.py create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/Dockerfile create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json diff --git a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh new file mode 100644 index 000000000..9b1dbd396 --- /dev/null +++ b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +source ${SCRIPTS}/common_functions.sh + +export PRH_SERVICE="prh" +export DMAAP_SIMULATOR="dmaap_simulator" + +cd ${WORKSPACE}/test/csit/tests/prh/testcases/resources/ + +docker login -u docker -p docker nexus3.onap.org:10003 +docker-compose up -d + +# Wait for initialization of Docker containers +for i in {1..50}; do + if [ $(docker inspect --format '{{ .State.Running }}' ${PRH_SERVICE}) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ] + then + echo "dmaap_simulator and prh services are running" + break + else + echo sleep ${i} + sleep ${i} + fi +done + +PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${PRH_SERVICE}) +DMAAP_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${DMAAP_SIMULATOR}) + +bypass_ip_adress ${PRH_IP} +bypass_ip_adress ${DMAAP_SIMULATOR_IP} + +echo PRH_IP=${PRH_IP} +echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP} + +# Wait for initialization of docker services +for i in {1..50}; do + curl -sS -m 1 localhost:2222 && \ + curl -sS -m 1 localhost:8100/heartbeat && break + echo sleep ${i} + sleep ${i} +done + +# +docker cp prh:/config/prh_endpoints.json ${WORKDIR} +sed -i -e 's/"dmaapHostName":.*/"dmaapHostName": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json +sed -i -e 's/"aaiHost":.*/"aaiHost": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json +docker cp ${WORKDIR}/prh_endpoints.json prh:/config/ + +#Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v PRH:localhost:8100" \ No newline at end of file diff --git a/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh b/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh new file mode 100644 index 000000000..5ff3c6689 --- /dev/null +++ b/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Copyright 2017 Nokia, Inc. and others. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +kill-instance.sh prh +kill-instance.sh dmaap_simulator \ No newline at end of file diff --git a/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt b/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt new file mode 100644 index 000000000..480dc6409 --- /dev/null +++ b/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. +prh/testcases diff --git a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot b/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot new file mode 100644 index 000000000..bb7e3cac1 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot @@ -0,0 +1,48 @@ +*** Settings *** +Library OperatingSystem +Library RequestsLibrary +Library requests +Library Collections +Library String + +*** Variables *** +${PNF_REGISTER_URL} http://${DMAAP_SIMULATOR}/events/unauthenticated.SEC_OTHER_OUTPUT +${PNF_READY_URL} http://${DMAAP_SIMULATOR}/events/pnfReady +${PRH_START_URL} http://${PRH}/start +${PNF_REGISTER_EVENT} %{WORKSPACE}/test/csit/tests/prh/testcases/resources/events/pnf_register_event.json + + +*** Test Cases *** +Run Posting and Consuming + [Documentation] Post message to new topic and consume it + [Timeout] 1 minute + ${req_data}= Get Binary File ${PNF_REGISTER_EVENT} + ${resp}= PostCall ${PNF_REGISTER_URL} ${req_data} + log ${PNF_REGISTER_URL} + log ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 + # ${count}= Evaluate $resp.json().get('count') + log 'JSON Response Code:' ${resp} + ${resp}= GetCall ${PRH_START_URL} + log ${PRH_START_URL} + log ${resp.text} + Should Be Equal As Strings ${resp.status_code} 201 + ${resp}= GetCall ${PNF_READY_URL} + log ${PNF_READY_URL} + log ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 + log 'JSON Response Code:' ${resp} + + +*** Keywords *** +PostCall + [Arguments] ${url} ${data} + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json + ${resp}= Evaluate requests.post('${url}',data='${data}', headers=${headers},verify=False) requests + [Return] ${resp} + +GetCall + [Arguments] ${url} + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json + ${resp}= Evaluate requests.get('${url}', headers=${headers}, verify=False) requests + [Return] ${resp} \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/CommonEventFormat_28.3.json b/test/csit/tests/dcaegen2/prh_testcases/resources/CommonEventFormat_28.3.json new file mode 100644 index 000000000..90f6d81a5 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/CommonEventFormat_28.3.json @@ -0,0 +1,1866 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + + "definitions": { + "attCopyrightNotice": { + "description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)", + "type": "object", + "properties": { + "useAndRedistribution": { + "description": "You may not use this file except in compliance with the License.You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0", + "type": "string" + }, + "licenseLink": { + "description": "http://www.apache.org/licenses/LICENSE-2.0", + "type":"string" + }, + "condition1": { + "description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,", + "type": "string" + }, + "condition2": { + "description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.", + "type": "string" + }, + "condition3": { + "description": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.", + "type": "string" + }, + "condition4": { + "description": "See the License for the specific language governing permissions and limitations under the License.", + "type": "string" + }, + "Trademarks": { + "description": "ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.", + "type": "string" + } + } + }, + + "codecsInUse": { + "description": "number of times an identified codec was used over the measurementInterval", + "type": "object", + "properties": { + "codecIdentifier": { "type": "string" }, + "numberInUse": { "type": "integer" } + }, + "required": [ "codecIdentifier", "numberInUse" ] + }, + "command": { + "description": "command from an event collector toward an event source", + "type": "object", + "properties": { + "commandType": { + "type": "string", + "enum": [ + "heartbeatIntervalChange", + "measurementIntervalChange", + "provideThrottlingState", + "throttlingSpecification" + ] + }, + "eventDomainThrottleSpecification": { "$ref": "#/definitions/eventDomainThrottleSpecification" }, + "heartbeatInterval": { "type": "integer" }, + "measurementInterval": { "type": "integer" } + }, + "required": [ "commandType" ] + }, + "commandList": { + "description": "array of commands from an event collector toward an event source", + "type": "array", + "items": { + "$ref": "#/definitions/command" + }, + "minItems": 0 + }, + "commonEventHeader": { + "description": "fields common to all events", + "type": "object", + "properties": { + "domain": { + "description": "the eventing domain associated with the event", + "type": "string", + "enum": [ + "fault", + "heartbeat", + "measurementsForVfScaling", + "mobileFlow", + "other", + "sipSignaling", + "stateChange", + "syslog", + "thresholdCrossingAlert", + "voiceQuality" + ] + }, + "eventId": { + "description": "event key that is unique to the event source", + "type": "string" + }, + "eventName": { + "description": "unique event name", + "type": "string" + }, + "eventType": { + "description": "for example - applicationVnf, guestOS, hostOS, platform", + "type": "string" + }, + "internalHeaderFields": { "$ref": "#/definitions/internalHeaderFields" }, + "lastEpochMicrosec": { + "description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds", + "type": "number" + }, + "nfcNamingCode": { + "description": "3 character network function component type, aligned with vfc naming standards", + "type": "string" + }, + "nfNamingCode": { + "description": "4 character network function type, aligned with vnf naming standards", + "type": "string" + }, + "priority": { + "description": "processing priority", + "type": "string", + "enum": [ + "High", + "Medium", + "Normal", + "Low" + ] + }, + "reportingEntityId": { + "description": "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process", + "type": "string" + }, + "reportingEntityName": { + "description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName", + "type": "string" + }, + "sequence": { + "description": "ordering of events communicated by an event source instance or 0 if not needed", + "type": "integer" + }, + "sourceId": { + "description": "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process", + "type": "string" + }, + "sourceName": { + "description": "name of the entity experiencing the event issue", + "type": "string" + }, + "startEpochMicrosec": { + "description": "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds", + "type": "number" + }, + "version": { + "description": "version of the event header", + "type": "number" + } + }, + "required": [ "domain", "eventId", "eventName", "lastEpochMicrosec", + "priority", "reportingEntityName", "sequence", "sourceName", + "startEpochMicrosec", "version" ] + }, + "counter": { + "description": "performance counter", + "type": "object", + "properties": { + "criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] }, + "name": { "type": "string" }, + "thresholdCrossed": { "type": "string" }, + "value": { "type": "string"} + }, + "required": [ "criticality", "name", "thresholdCrossed", "value" ] + }, + "cpuUsage": { + "description": "usage of an identified CPU", + "type": "object", + "properties": { + "cpuIdentifier": { + "description": "cpu identifer", + "type": "string" + }, + "cpuIdle": { + "description": "percentage of CPU time spent in the idle task", + "type": "number" + }, + "cpuUsageInterrupt": { + "description": "percentage of time spent servicing interrupts", + "type": "number" + }, + "cpuUsageNice": { + "description": "percentage of time spent running user space processes that have been niced", + "type": "number" + }, + "cpuUsageSoftIrq": { + "description": "percentage of time spent handling soft irq interrupts", + "type": "number" + }, + "cpuUsageSteal": { + "description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing", + "type": "number" + }, + "cpuUsageSystem": { + "description": "percentage of time spent on system tasks running the kernel", + "type": "number" + }, + "cpuUsageUser": { + "description": "percentage of time spent running un-niced user space processes", + "type": "number" + }, + "cpuWait": { + "description": "percentage of CPU time spent waiting for I/O operations to complete", + "type": "number" + }, + "percentUsage": { + "description": "aggregate cpu usage of the virtual machine on which the VNFC reporting the event is running", + "type": "number" + } + }, + "required": [ "cpuIdentifier", "percentUsage" ] + }, + "diskUsage": { + "description": "usage of an identified disk", + "type": "object", + "properties": { + "diskIdentifier": { + "description": "disk identifier", + "type": "string" + }, + "diskIoTimeAvg": { + "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the average over the measurement interval", + "type": "number" + }, + "diskIoTimeLast": { + "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the last value measurement within the measurement interval", + "type": "number" + }, + "diskIoTimeMax": { + "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the maximum value measurement within the measurement interval", + "type": "number" + }, + "diskIoTimeMin": { + "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the minimum value measurement within the measurement interval", + "type": "number" + }, + "diskMergedReadAvg": { + "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskMergedReadLast": { + "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval", + "type": "number" + }, + "diskMergedReadMax": { + "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval", + "type": "number" + }, + "diskMergedReadMin": { + "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval", + "type": "number" + }, + "diskMergedWriteAvg": { + "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskMergedWriteLast": { + "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval", + "type": "number" + }, + "diskMergedWriteMax": { + "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval", + "type": "number" + }, + "diskMergedWriteMin": { + "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval", + "type": "number" + }, + "diskOctetsReadAvg": { + "description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskOctetsReadLast": { + "description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval", + "type": "number" + }, + "diskOctetsReadMax": { + "description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval", + "type": "number" + }, + "diskOctetsReadMin": { + "description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval", + "type": "number" + }, + "diskOctetsWriteAvg": { + "description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskOctetsWriteLast": { + "description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval", + "type": "number" + }, + "diskOctetsWriteMax": { + "description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval", + "type": "number" + }, + "diskOctetsWriteMin": { + "description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval", + "type": "number" + }, + "diskOpsReadAvg": { + "description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskOpsReadLast": { + "description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval", + "type": "number" + }, + "diskOpsReadMax": { + "description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval", + "type": "number" + }, + "diskOpsReadMin": { + "description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval", + "type": "number" + }, + "diskOpsWriteAvg": { + "description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskOpsWriteLast": { + "description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval", + "type": "number" + }, + "diskOpsWriteMax": { + "description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval", + "type": "number" + }, + "diskOpsWriteMin": { + "description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval", + "type": "number" + }, + "diskPendingOperationsAvg": { + "description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskPendingOperationsLast": { + "description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval", + "type": "number" + }, + "diskPendingOperationsMax": { + "description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval", + "type": "number" + }, + "diskPendingOperationsMin": { + "description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval", + "type": "number" + }, + "diskTimeReadAvg": { + "description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskTimeReadLast": { + "description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval", + "type": "number" + }, + "diskTimeReadMax": { + "description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval", + "type": "number" + }, + "diskTimeReadMin": { + "description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval", + "type": "number" + }, + "diskTimeWriteAvg": { + "description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval", + "type": "number" + }, + "diskTimeWriteLast": { + "description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval", + "type": "number" + }, + "diskTimeWriteMax": { + "description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval", + "type": "number" + }, + "diskTimeWriteMin": { + "description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval", + "type": "number" + } + }, + "required": [ "diskIdentifier" ] + }, + "endOfCallVqmSummaries": { + "description": "provides end of call voice quality metrics", + "type": "object", + "properties": { + "adjacencyName": { + "description": " adjacency name", + "type": "string" + }, + "endpointDescription": { + "description": "Either Caller or Callee", + "type": "string", + "enum": ["Caller", "Callee"] + }, + "endpointJitter": { + "description": "", + "type": "number" + }, + "endpointRtpOctetsDiscarded": { + "description": "", + "type": "number" + }, + "endpointRtpOctetsReceived": { + "description": "", + "type": "number" + }, + "endpointRtpOctetsSent": { + "description": "", + "type": "number" + }, + "endpointRtpPacketsDiscarded": { + "description": "", + "type": "number" + }, + "endpointRtpPacketsReceived": { + "description": "", + "type": "number" + }, + "endpointRtpPacketsSent": { + "description": "", + "type": "number" + }, + "localJitter": { + "description": "", + "type": "number" + }, + "localRtpOctetsDiscarded": { + "description": "", + "type": "number" + }, + "localRtpOctetsReceived": { + "description": "", + "type": "number" + }, + "localRtpOctetsSent": { + "description": "", + "type": "number" + }, + "localRtpPacketsDiscarded": { + "description": "", + "type": "number" + }, + "localRtpPacketsReceived": { + "description": "", + "type": "number" + }, + "localRtpPacketsSent": { + "description": "", + "type": "number" + }, + "mosCqe": { + "description": "1-5 1dp", + "type": "number" + }, + "packetsLost": { + "description": "", + "type": "number" + }, + "packetLossPercent": { + "description" : "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)", + "type": "number" + }, + "rFactor": { + "description": "0-100", + "type": "number" + }, + "roundTripDelay": { + "description": "millisecs", + "type": "number" + } + }, + "required": [ "adjacencyName", "endpointDescription" ] + }, + "event": { + "description": "the root level of the common event format", + "type": "object", + "properties": { + "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" }, + "faultFields": { "$ref": "#/definitions/faultFields" }, + "heartbeatFields": { "$ref": "#/definitions/heartbeatFields" }, + "measurementsForVfScalingFields": { "$ref": "#/definitions/measurementsForVfScalingFields" }, + "mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" }, + "otherFields": { "$ref": "#/definitions/otherFields" }, + "sipSignalingFields": { "$ref": "#/definitions/sipSignalingFields" }, + "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" }, + "syslogFields": { "$ref": "#/definitions/syslogFields" }, + "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" }, + "voiceQualityFields": { "$ref": "#/definitions/voiceQualityFields" } + }, + "required": [ "commonEventHeader" ] + }, + "eventDomainThrottleSpecification": { + "description": "specification of what information to suppress within an event domain", + "type": "object", + "properties": { + "eventDomain": { + "description": "Event domain enum from the commonEventHeader domain field", + "type": "string" + }, + "suppressedFieldNames": { + "description": "List of optional field names in the event block that should not be sent to the Event Listener", + "type": "array", + "items": { + "type": "string" + } + }, + "suppressedNvPairsList": { + "description": "Optional list of specific NvPairsNames to suppress within a given Name-Value Field", + "type": "array", + "items": { + "$ref": "#/definitions/suppressedNvPairs" + } + } + }, + "required": [ "eventDomain" ] + }, + "eventDomainThrottleSpecificationList": { + "description": "array of eventDomainThrottleSpecifications", + "type": "array", + "items": { + "$ref": "#/definitions/eventDomainThrottleSpecification" + }, + "minItems": 0 + }, + "eventList": { + "description": "array of events", + "type": "array", + "items": { + "$ref": "#/definitions/event" + } + }, + "eventThrottlingState": { + "description": "reports the throttling in force at the event source", + "type": "object", + "properties": { + "eventThrottlingMode": { + "description": "Mode the event manager is in", + "type": "string", + "enum": [ + "normal", + "throttled" + ] + }, + "eventDomainThrottleSpecificationList": { "$ref": "#/definitions/eventDomainThrottleSpecificationList" } + }, + "required": [ "eventThrottlingMode" ] + }, + "faultFields": { + "description": "fields specific to fault events", + "type": "object", + "properties": { + "alarmAdditionalInformation": { + "description": "additional alarm information", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "alarmCondition": { + "description": "alarm condition reported by the device", + "type": "string" + }, + "alarmInterfaceA": { + "description": "card, port, channel or interface name of the device generating the alarm", + "type": "string" + }, + "eventCategory": { + "description": "Event category, for example: license, link, routing, security, signaling", + "type": "string" + }, + "eventSeverity": { + "description": "event severity", + "type": "string", + "enum": [ + "CRITICAL", + "MAJOR", + "MINOR", + "WARNING", + "NORMAL" + ] + }, + "eventSourceType": { + "description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction", + "type": "string" + }, + "faultFieldsVersion": { + "description": "version of the faultFields block", + "type": "number" + }, + "specificProblem": { + "description": "short description of the alarm or problem", + "type": "string" + }, + "vfStatus": { + "description": "virtual function status enumeration", + "type": "string", + "enum": [ + "Active", + "Idle", + "Preparing to terminate", + "Ready to terminate", + "Requesting termination" + ] + } + }, + "required": [ "alarmCondition", "eventSeverity", "eventSourceType", + "faultFieldsVersion", "specificProblem", "vfStatus" ] + }, + "featuresInUse": { + "description": "number of times an identified feature was used over the measurementInterval", + "type": "object", + "properties": { + "featureIdentifier": { "type": "string" }, + "featureUtilization": { "type": "integer" } + }, + "required": [ "featureIdentifier", "featureUtilization" ] + }, + "field": { + "description": "name value pair", + "type": "object", + "properties": { + "name": { "type": "string" }, + "value": { "type": "string" } + }, + "required": [ "name", "value" ] + }, + "filesystemUsage": { + "description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second", + "type": "object", + "properties": { + "blockConfigured": { "type": "number" }, + "blockIops": { "type": "number" }, + "blockUsed": { "type": "number" }, + "ephemeralConfigured": { "type": "number" }, + "ephemeralIops": { "type": "number" }, + "ephemeralUsed": { "type": "number" }, + "filesystemName": { "type": "string" } + }, + "required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured", + "ephemeralIops", "ephemeralUsed", "filesystemName" ] + }, + "gtpPerFlowMetrics": { + "description": "Mobility GTP Protocol per flow metrics", + "type": "object", + "properties": { + "avgBitErrorRate": { + "description": "average bit error rate", + "type": "number" + }, + "avgPacketDelayVariation": { + "description": "Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets", + "type": "number" + }, + "avgPacketLatency": { + "description": "average delivery latency", + "type": "number" + }, + "avgReceiveThroughput": { + "description": "average receive throughput", + "type": "number" + }, + "avgTransmitThroughput": { + "description": "average transmit throughput", + "type": "number" + }, + "durConnectionFailedStatus": { + "description": "duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval", + "type": "number" + }, + "durTunnelFailedStatus": { + "description": "Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval", + "type": "number" + }, + "flowActivatedBy": { + "description": "Endpoint activating the flow", + "type": "string" + }, + "flowActivationEpoch": { + "description": "Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available", + "type": "number" + }, + "flowActivationMicrosec": { + "description": "Integer microseconds for the start of the flow connection", + "type": "number" + }, + "flowActivationTime": { + "description": "time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800", + "type": "string" + }, + "flowDeactivatedBy": { + "description": "Endpoint deactivating the flow", + "type": "string" + }, + "flowDeactivationEpoch": { + "description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time", + "type": "number" + }, + "flowDeactivationMicrosec": { + "description": "Integer microseconds for the start of the flow connection", + "type": "number" + }, + "flowDeactivationTime": { + "description": "Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800", + "type": "string" + }, + "flowStatus": { + "description": "connection status at reporting time as a working / inactive / failed indicator value", + "type": "string" + }, + "gtpConnectionStatus": { + "description": "Current connection state at reporting time", + "type": "string" + }, + "gtpTunnelStatus": { + "description": "Current tunnel state at reporting time", + "type": "string" + }, + "ipTosCountList": { + "description": "array of key: value pairs where the keys are drawn from the IP Type-of-Service identifiers which range from '0' to '255', and the values are the count of packets that had those ToS identifiers in the flow", + "type": "array", + "items": { + "type": "array", + "items": [ + { "type": "string" }, + { "type": "number" } + ] + } + }, + "ipTosList": { + "description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'", + "type": "array", + "items": { + "type": "string" + } + }, + "largePacketRtt": { + "description": "large packet round trip time", + "type": "number" + }, + "largePacketThreshold": { + "description": "large packet threshold being applied", + "type": "number" + }, + "maxPacketDelayVariation": { + "description": "Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets", + "type": "number" + }, + "maxReceiveBitRate": { + "description": "maximum receive bit rate", + "type": "number" + }, + "maxTransmitBitRate": { + "description": "maximum transmit bit rate", + "type": "number" + }, + "mobileQciCosCountList": { + "description": "array of key: value pairs where the keys are drawn from LTE QCI or UMTS class of service strings, and the values are the count of packets that had those strings in the flow", + "type": "array", + "items": { + "type": "array", + "items": [ + { "type": "string" }, + { "type": "number" } + ] + } + }, + "mobileQciCosList": { + "description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow", + "type": "array", + "items": { + "type": "string" + } + }, + "numActivationFailures": { + "description": "Number of failed activation requests, as observed by the reporting node", + "type": "number" + }, + "numBitErrors": { + "description": "number of errored bits", + "type": "number" + }, + "numBytesReceived": { + "description": "number of bytes received, including retransmissions", + "type": "number" + }, + "numBytesTransmitted": { + "description": "number of bytes transmitted, including retransmissions", + "type": "number" + }, + "numDroppedPackets": { + "description": "number of received packets dropped due to errors per virtual interface", + "type": "number" + }, + "numGtpEchoFailures": { + "description": "Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2", + "type": "number" + }, + "numGtpTunnelErrors": { + "description": "Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1", + "type": "number" + }, + "numHttpErrors": { + "description": "Http error count", + "type": "number" + }, + "numL7BytesReceived": { + "description": "number of tunneled layer 7 bytes received, including retransmissions", + "type": "number" + }, + "numL7BytesTransmitted": { + "description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions", + "type": "number" + }, + "numLostPackets": { + "description": "number of lost packets", + "type": "number" + }, + "numOutOfOrderPackets": { + "description": "number of out-of-order packets", + "type": "number" + }, + "numPacketErrors": { + "description": "number of errored packets", + "type": "number" + }, + "numPacketsReceivedExclRetrans": { + "description": "number of packets received, excluding retransmission", + "type": "number" + }, + "numPacketsReceivedInclRetrans": { + "description": "number of packets received, including retransmission", + "type": "number" + }, + "numPacketsTransmittedInclRetrans": { + "description": "number of packets transmitted, including retransmissions", + "type": "number" + }, + "numRetries": { + "description": "number of packet retries", + "type": "number" + }, + "numTimeouts": { + "description": "number of packet timeouts", + "type": "number" + }, + "numTunneledL7BytesReceived": { + "description": "number of tunneled layer 7 bytes received, excluding retransmissions", + "type": "number" + }, + "roundTripTime": { + "description": "round trip time", + "type": "number" + }, + "tcpFlagCountList": { + "description": "array of key: value pairs where the keys are drawn from TCP Flags and the values are the count of packets that had that TCP Flag in the flow", + "type": "array", + "items": { + "type": "array", + "items": [ + { "type": "string" }, + { "type": "number" } + ] + } + }, + "tcpFlagList": { + "description": "Array of unique TCP Flags observed in the flow", + "type": "array", + "items": { + "type": "string" + } + }, + "timeToFirstByte": { + "description": "Time in milliseconds between the connection activation and first byte received", + "type": "number" + } + }, + "required": [ "avgBitErrorRate", "avgPacketDelayVariation", "avgPacketLatency", + "avgReceiveThroughput", "avgTransmitThroughput", + "flowActivationEpoch", "flowActivationMicrosec", + "flowDeactivationEpoch", "flowDeactivationMicrosec", + "flowDeactivationTime", "flowStatus", + "maxPacketDelayVariation", "numActivationFailures", + "numBitErrors", "numBytesReceived", "numBytesTransmitted", + "numDroppedPackets", "numL7BytesReceived", + "numL7BytesTransmitted", "numLostPackets", + "numOutOfOrderPackets", "numPacketErrors", + "numPacketsReceivedExclRetrans", + "numPacketsReceivedInclRetrans", + "numPacketsTransmittedInclRetrans", + "numRetries", "numTimeouts", "numTunneledL7BytesReceived", + "roundTripTime", "timeToFirstByte" + ] + }, + "heartbeatFields": { + "description": "optional field block for fields specific to heartbeat events", + "type": "object", + "properties": { + "additionalFields": { + "description": "additional heartbeat fields if needed", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "heartbeatFieldsVersion": { + "description": "version of the heartbeatFields block", + "type": "number" + }, + "heartbeatInterval": { + "description": "current heartbeat interval in seconds", + "type": "integer" + } + }, + "required": [ "heartbeatFieldsVersion", "heartbeatInterval" ] + }, + "internalHeaderFields": { + "description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources", + "type": "object" + }, + "jsonObject": { + "description": "json object schema, name and other meta-information along with one or more object instances", + "type": "object", + "properties": { + "objectInstances": { + "description": "one or more instances of the jsonObject", + "type": "array", + "items": { + "$ref": "#/definitions/jsonObjectInstance" + } + }, + "objectName": { + "description": "name of the JSON Object", + "type": "string" + }, + "objectSchema": { + "description": "json schema for the object", + "type": "string" + }, + "objectSchemaUrl": { + "description": "Url to the json schema for the object", + "type": "string" + }, + "nfSubscribedObjectName": { + "description": "name of the object associated with the nfSubscriptonId", + "type": "string" + }, + "nfSubscriptionId": { + "description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject", + "type": "string" + } + }, + "required": [ "objectInstances", "objectName" ] + }, + "jsonObjectInstance": { + "description": "meta-information about an instance of a jsonObject along with the actual object instance", + "type": "object", + "properties": { + "objectInstance": { + "description": "an instance conforming to the jsonObject schema", + "type": "object" + }, + "objectInstanceEpochMicrosec": { + "description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds", + "type": "number" + }, + "objectKeys": { + "description": "an ordered set of keys that identifies this particular instance of jsonObject", + "type": "array", + "items": { + "$ref": "#/definitions/key" + } + } + }, + "required": [ "objectInstance" ] + }, + "key": { + "description": "tuple which provides the name of a key along with its value and relative order", + "type": "object", + "properties": { + "keyName": { + "description": "name of the key", + "type": "string" + }, + "keyOrder": { + "description": "relative sequence or order of the key with respect to other keys", + "type": "integer" + }, + "keyValue": { + "description": "value of the key", + "type": "string" + } + }, + "required": [ "keyName" ] + }, + "latencyBucketMeasure": { + "description": "number of counts falling within a defined latency bucket", + "type": "object", + "properties": { + "countsInTheBucket": { "type": "number" }, + "highEndOfLatencyBucket": { "type": "number" }, + "lowEndOfLatencyBucket": { "type": "number" } + }, + "required": [ "countsInTheBucket" ] + }, + "measurementsForVfScalingFields": { + "description": "measurementsForVfScaling fields", + "type": "object", + "properties": { + "additionalFields": { + "description": "additional name-value-pair fields", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "additionalMeasurements": { + "description": "array of named name-value-pair arrays", + "type": "array", + "items": { + "$ref": "#/definitions/namedArrayOfFields" + } + }, + "additionalObjects": { + "description": "array of JSON objects described by name, schema and other meta-information", + "type": "array", + "items": { + "$ref": "#/definitions/jsonObject" + } + }, + "codecUsageArray": { + "description": "array of codecs in use", + "type": "array", + "items": { + "$ref": "#/definitions/codecsInUse" + } + }, + "concurrentSessions": { + "description": "peak concurrent sessions for the VM or VNF over the measurementInterval", + "type": "integer" + }, + "configuredEntities": { + "description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the VNF", + "type": "integer" + }, + "cpuUsageArray": { + "description": "usage of an array of CPUs", + "type": "array", + "items": { + "$ref": "#/definitions/cpuUsage" + } + }, + "diskUsageArray": { + "description": "usage of an array of disks", + "type": "array", + "items": { + "$ref": "#/definitions/diskUsage" + } + }, + "featureUsageArray": { + "description": "array of features in use", + "type": "array", + "items": { + "$ref": "#/definitions/featuresInUse" + } + }, + "filesystemUsageArray": { + "description": "filesystem usage of the VM on which the VNFC reporting the event is running", + "type": "array", + "items": { + "$ref": "#/definitions/filesystemUsage" + } + }, + "latencyDistribution": { + "description": "array of integers representing counts of requests whose latency in milliseconds falls within per-VNF configured ranges", + "type": "array", + "items": { + "$ref": "#/definitions/latencyBucketMeasure" + } + }, + "meanRequestLatency": { + "description": "mean seconds required to respond to each request for the VM on which the VNFC reporting the event is running", + "type": "number" + }, + "measurementInterval": { + "description": "interval over which measurements are being reported in seconds", + "type": "number" + }, + "measurementsForVfScalingVersion": { + "description": "version of the measurementsForVfScaling block", + "type": "number" + }, + "memoryUsageArray": { + "description": "memory usage of an array of VMs", + "type": "array", + "items": { + "$ref": "#/definitions/memoryUsage" + } + }, + "numberOfMediaPortsInUse": { + "description": "number of media ports in use", + "type": "integer" + }, + "requestRate": { + "description": "peak rate of service requests per second to the VNF over the measurementInterval", + "type": "number" + }, + "vnfcScalingMetric": { + "description": "represents busy-ness of the VNF from 0 to 100 as reported by the VNFC", + "type": "integer" + }, + "vNicPerformanceArray": { + "description": "usage of an array of virtual network interface cards", + "type": "array", + "items": { + "$ref": "#/definitions/vNicPerformance" + } + } + }, + "required": [ "measurementInterval", "measurementsForVfScalingVersion" ] + }, + "memoryUsage": { + "description": "memory usage of an identified virtual machine", + "type": "object", + "properties": { + "memoryBuffered": { + "description": "kibibytes of temporary storage for raw disk blocks", + "type": "number" + }, + "memoryCached": { + "description": "kibibytes of memory used for cache", + "type": "number" + }, + "memoryConfigured": { + "description": "kibibytes of memory configured in the virtual machine on which the VNFC reporting the event is running", + "type": "number" + }, + "memoryFree": { + "description": "kibibytes of physical RAM left unused by the system", + "type": "number" + }, + "memorySlabRecl": { + "description": "the part of the slab that can be reclaimed such as caches measured in kibibytes", + "type": "number" + }, + "memorySlabUnrecl": { + "description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes", + "type": "number" + }, + "memoryUsed": { + "description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes", + "type": "number" + }, + "vmIdentifier": { + "description": "virtual machine identifier associated with the memory metrics", + "type": "string" + } + }, + "required": [ "memoryFree", "memoryUsed", "vmIdentifier" ] + }, + "mobileFlowFields": { + "description": "mobileFlow fields", + "type": "object", + "properties": { + "additionalFields": { + "description": "additional mobileFlow fields if needed", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "applicationType": { + "description": "Application type inferred", + "type": "string" + }, + "appProtocolType": { + "description": "application protocol", + "type": "string" + }, + "appProtocolVersion": { + "description": "application protocol version", + "type": "string" + }, + "cid": { + "description": "cell id", + "type": "string" + }, + "connectionType": { + "description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc", + "type": "string" + }, + "ecgi": { + "description": "Evolved Cell Global Id", + "type": "string" + }, + "flowDirection": { + "description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow", + "type": "string" + }, + "gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" }, + "gtpProtocolType": { + "description": "GTP protocol", + "type": "string" + }, + "gtpVersion": { + "description": "GTP protocol version", + "type": "string" + }, + "httpHeader": { + "description": "HTTP request header, if the flow connects to a node referenced by HTTP", + "type": "string" + }, + "imei": { + "description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device", + "type": "string" + }, + "imsi": { + "description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device", + "type": "string" + }, + "ipProtocolType": { + "description": "IP protocol type e.g., TCP, UDP, RTP...", + "type": "string" + }, + "ipVersion": { + "description": "IP protocol version e.g., IPv4, IPv6", + "type": "string" + }, + "lac": { + "description": "location area code", + "type": "string" + }, + "mcc": { + "description": "mobile country code", + "type": "string" + }, + "mnc": { + "description": "mobile network code", + "type": "string" + }, + "mobileFlowFieldsVersion": { + "description": "version of the mobileFlowFields block", + "type": "number" + }, + "msisdn": { + "description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device", + "type": "string" + }, + "otherEndpointIpAddress": { + "description": "IP address for the other endpoint, as used for the flow being reported on", + "type": "string" + }, + "otherEndpointPort": { + "description": "IP Port for the reporting entity, as used for the flow being reported on", + "type": "integer" + }, + "otherFunctionalRole": { + "description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...", + "type": "string" + }, + "rac": { + "description": "routing area code", + "type": "string" + }, + "radioAccessTechnology": { + "description": "Radio Access Technology e.g., 2G, 3G, LTE", + "type": "string" + }, + "reportingEndpointIpAddr": { + "description": "IP address for the reporting entity, as used for the flow being reported on", + "type": "string" + }, + "reportingEndpointPort": { + "description": "IP port for the reporting entity, as used for the flow being reported on", + "type": "integer" + }, + "sac": { + "description": "service area code", + "type": "string" + }, + "samplingAlgorithm": { + "description": "Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied", + "type": "integer" + }, + "tac": { + "description": "transport area code", + "type": "string" + }, + "tunnelId": { + "description": "tunnel identifier", + "type": "string" + }, + "vlanId": { + "description": "VLAN identifier used by this flow", + "type": "string" + } + }, + "required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType", "ipVersion", + "mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort", + "reportingEndpointIpAddr", "reportingEndpointPort" ] + }, + "namedArrayOfFields": { + "description": "an array of name value pairs along with a name for the array", + "type": "object", + "properties": { + "name": { "type": "string" }, + "arrayOfFields": { + "description": "array of name value pairs", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + } + }, + "required": [ "name", "arrayOfFields" ] + }, + "otherFields": { + "description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration", + "type": "object", + "properties": { + "hashOfNameValuePairArrays": { + "description": "array of named name-value-pair arrays", + "type": "array", + "items": { + "$ref": "#/definitions/namedArrayOfFields" + } + }, + "jsonObjects": { + "description": "array of JSON objects described by name, schema and other meta-information", + "type": "array", + "items": { + "$ref": "#/definitions/jsonObject" + } + }, + "nameValuePairs": { + "description": "array of name-value pairs", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "otherFieldsVersion": { + "description": "version of the otherFields block", + "type": "number" + } + }, + "required": [ "otherFieldsVersion" ] + }, + "requestError": { + "description": "standard request error data structure", + "type": "object", + "properties": { + "messageId": { + "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception", + "type": "string" + }, + "text": { + "description": "Message text, with replacement variables marked with %n, where n is an index into the list of elements, starting at 1", + "type": "string" + }, + "url": { + "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents", + "type": "string" + }, + "variables": { + "description": "List of zero or more strings that represent the contents of the variables used by the message text", + "type": "string" + } + }, + "required": [ "messageId", "text" ] + }, + "sipSignalingFields": { + "description": "sip signaling fields", + "type": "object", + "properties": { + "additionalInformation": { + "description": "additional sip signaling fields if needed", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "compressedSip": { + "description": "the full SIP request/response including headers and bodies", + "type": "string" + }, + "correlator": { + "description": "this is the same for all events on this call", + "type": "string" + }, + "localIpAddress": { + "description": "IP address on VNF", + "type": "string" + }, + "localPort": { + "description": "port on VNF", + "type": "string" + }, + "remoteIpAddress": { + "description": "IP address of peer endpoint", + "type": "string" + }, + "remotePort": { + "description": "port of peer endpoint", + "type": "string" + }, + "sipSignalingFieldsVersion": { + "description": "version of the sipSignalingFields block", + "type": "number" + }, + "summarySip": { + "description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)", + "type": "string" + }, + "vendorVnfNameFields": { + "$ref": "#/definitions/vendorVnfNameFields" + } + }, + "required": [ "correlator", "localIpAddress", "localPort", "remoteIpAddress", + "remotePort", "sipSignalingFieldsVersion", "vendorVnfNameFields" ] + }, + "stateChangeFields": { + "description": "stateChange fields", + "type": "object", + "properties": { + "additionalFields": { + "description": "additional stateChange fields if needed", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "newState": { + "description": "new state of the entity", + "type": "string", + "enum": [ + "inService", + "maintenance", + "outOfService" + ] + }, + "oldState": { + "description": "previous state of the entity", + "type": "string", + "enum": [ + "inService", + "maintenance", + "outOfService" + ] + }, + "stateChangeFieldsVersion": { + "description": "version of the stateChangeFields block", + "type": "number" + }, + "stateInterface": { + "description": "card or port name of the entity that changed state", + "type": "string" + } + }, + "required": [ "newState", "oldState", "stateChangeFieldsVersion", "stateInterface" ] + }, + "suppressedNvPairs": { + "description": "List of specific NvPairsNames to suppress within a given Name-Value Field for event Throttling", + "type": "object", + "properties": { + "nvPairFieldName": { + "description": "Name of the field within which are the nvpair names to suppress", + "type": "string" + }, + "suppressedNvPairNames": { + "description": "Array of nvpair names to suppress within the nvpairFieldName", + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ "nvPairFieldName", "suppressedNvPairNames" ] + }, + "syslogFields": { + "description": "sysLog fields", + "type": "object", + "properties": { + "additionalFields": { + "description": "additional syslog fields if needed provided as name=value delimited by a pipe ‘|’ symbol, for example: 'name1=value1|name2=value2|…'", + "type": "string" + }, + "eventSourceHost": { + "description": "hostname of the device", + "type": "string" + }, + "eventSourceType": { + "description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction", + "type": "string" + }, + "syslogFacility": { + "description": "numeric code from 0 to 23 for facility--see table in documentation", + "type": "integer" + }, + "syslogFieldsVersion": { + "description": "version of the syslogFields block", + "type": "number" + }, + "syslogMsg": { + "description": "syslog message", + "type": "string" + }, + "syslogPri": { + "description": "0-192 combined severity and facility", + "type": "integer" + }, + "syslogProc": { + "description": "identifies the application that originated the message", + "type": "string" + }, + "syslogProcId": { + "description": "a change in the value of this field indicates a discontinuity in syslog reporting", + "type": "number" + }, + "syslogSData": { + "description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs", + "type": "string" + }, + "syslogSdId": { + "description": "0-32 char in format name@number for example ourSDID@32473", + "type": "string" + }, + "syslogSev": { + "description": "numerical Code for severity derived from syslogPri as remaider of syslogPri / 8", + "type": "string", + "enum": [ + "Alert", + "Critical", + "Debug", + "Emergency", + "Error", + "Info", + "Notice", + "Warning" + ] + }, + "syslogTag": { + "description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided", + "type": "string" + }, + "syslogVer": { + "description": "IANA assigned version of the syslog protocol specification - typically 1", + "type": "number" + } + }, + "required": [ "eventSourceType", "syslogFieldsVersion", "syslogMsg", "syslogTag" ] + }, + "thresholdCrossingAlertFields": { + "description": "fields specific to threshold crossing alert events", + "type": "object", + "properties": { + "additionalFields": { + "description": "additional threshold crossing alert fields if needed", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "additionalParameters": { + "description": "performance counters", + "type": "array", + "items": { + "$ref": "#/definitions/counter" + } + }, + "alertAction": { + "description": "Event action", + "type": "string", + "enum": [ + "CLEAR", + "CONT", + "SET" + ] + }, + "alertDescription": { + "description": "Unique short alert description such as IF-SHUB-ERRDROP", + "type": "string" + }, + "alertType": { + "description": "Event type", + "type": "string", + "enum": [ + "CARD-ANOMALY", + "ELEMENT-ANOMALY", + "INTERFACE-ANOMALY", + "SERVICE-ANOMALY" + ] + }, + "alertValue": { + "description": "Calculated API value (if applicable)", + "type": "string" + }, + "associatedAlertIdList": { + "description": "List of eventIds associated with the event being reported", + "type": "array", + "items": { "type": "string" } + }, + "collectionTimestamp": { + "description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800", + "type": "string" + }, + "dataCollector": { + "description": "Specific performance collector instance used", + "type": "string" + }, + "elementType": { + "description": "type of network element - internal ATT field", + "type": "string" + }, + "eventSeverity": { + "description": "event severity or priority", + "type": "string", + "enum": [ + "CRITICAL", + "MAJOR", + "MINOR", + "WARNING", + "NORMAL" + ] + }, + "eventStartTimestamp": { + "description": "Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800", + "type": "string" + }, + "interfaceName": { + "description": "Physical or logical port or card (if applicable)", + "type": "string" + }, + "networkService": { + "description": "network name - internal ATT field", + "type": "string" + }, + "possibleRootCause": { + "description": "Reserved for future use", + "type": "string" + }, + "thresholdCrossingFieldsVersion": { + "description": "version of the thresholdCrossingAlertFields block", + "type": "number" + } + }, + "required": [ + "additionalParameters", + "alertAction", + "alertDescription", + "alertType", + "collectionTimestamp", + "eventSeverity", + "eventStartTimestamp", + "thresholdCrossingFieldsVersion" + ] + }, + "vendorVnfNameFields": { + "description": "provides vendor, vnf and vfModule identifying information", + "type": "object", + "properties": { + "vendorName": { + "description": "VNF vendor name", + "type": "string" + }, + "vfModuleName": { + "description": "ASDC vfModuleName for the vfModule generating the event", + "type": "string" + }, + "vnfName": { + "description": "ASDC modelName for the VNF generating the event", + "type": "string" + } + }, + "required": [ "vendorName" ] + }, + "vNicPerformance": { + "description": "describes the performance and errors of an identified virtual network interface card", + "type": "object", + "properties": { + "receivedBroadcastPacketsAccumulated": { + "description": "Cumulative count of broadcast packets received as read at the end of the measurement interval", + "type": "number" + }, + "receivedBroadcastPacketsDelta": { + "description": "Count of broadcast packets received within the measurement interval", + "type": "number" + }, + "receivedDiscardedPacketsAccumulated": { + "description": "Cumulative count of discarded packets received as read at the end of the measurement interval", + "type": "number" + }, + "receivedDiscardedPacketsDelta": { + "description": "Count of discarded packets received within the measurement interval", + "type": "number" + }, + "receivedErrorPacketsAccumulated": { + "description": "Cumulative count of error packets received as read at the end of the measurement interval", + "type": "number" + }, + "receivedErrorPacketsDelta": { + "description": "Count of error packets received within the measurement interval", + "type": "number" + }, + "receivedMulticastPacketsAccumulated": { + "description": "Cumulative count of multicast packets received as read at the end of the measurement interval", + "type": "number" + }, + "receivedMulticastPacketsDelta": { + "description": "Count of multicast packets received within the measurement interval", + "type": "number" + }, + "receivedOctetsAccumulated": { + "description": "Cumulative count of octets received as read at the end of the measurement interval", + "type": "number" + }, + "receivedOctetsDelta": { + "description": "Count of octets received within the measurement interval", + "type": "number" + }, + "receivedTotalPacketsAccumulated": { + "description": "Cumulative count of all packets received as read at the end of the measurement interval", + "type": "number" + }, + "receivedTotalPacketsDelta": { + "description": "Count of all packets received within the measurement interval", + "type": "number" + }, + "receivedUnicastPacketsAccumulated": { + "description": "Cumulative count of unicast packets received as read at the end of the measurement interval", + "type": "number" + }, + "receivedUnicastPacketsDelta": { + "description": "Count of unicast packets received within the measurement interval", + "type": "number" + }, + "transmittedBroadcastPacketsAccumulated": { + "description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval", + "type": "number" + }, + "transmittedBroadcastPacketsDelta": { + "description": "Count of broadcast packets transmitted within the measurement interval", + "type": "number" + }, + "transmittedDiscardedPacketsAccumulated": { + "description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval", + "type": "number" + }, + "transmittedDiscardedPacketsDelta": { + "description": "Count of discarded packets transmitted within the measurement interval", + "type": "number" + }, + "transmittedErrorPacketsAccumulated": { + "description": "Cumulative count of error packets transmitted as read at the end of the measurement interval", + "type": "number" + }, + "transmittedErrorPacketsDelta": { + "description": "Count of error packets transmitted within the measurement interval", + "type": "number" + }, + "transmittedMulticastPacketsAccumulated": { + "description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval", + "type": "number" + }, + "transmittedMulticastPacketsDelta": { + "description": "Count of multicast packets transmitted within the measurement interval", + "type": "number" + }, + "transmittedOctetsAccumulated": { + "description": "Cumulative count of octets transmitted as read at the end of the measurement interval", + "type": "number" + }, + "transmittedOctetsDelta": { + "description": "Count of octets transmitted within the measurement interval", + "type": "number" + }, + "transmittedTotalPacketsAccumulated": { + "description": "Cumulative count of all packets transmitted as read at the end of the measurement interval", + "type": "number" + }, + "transmittedTotalPacketsDelta": { + "description": "Count of all packets transmitted within the measurement interval", + "type": "number" + }, + "transmittedUnicastPacketsAccumulated": { + "description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval", + "type": "number" + }, + "transmittedUnicastPacketsDelta": { + "description": "Count of unicast packets transmitted within the measurement interval", + "type": "number" + }, + "valuesAreSuspect": { + "description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions", + "type": "string", + "enum": [ "true", "false" ] + }, + "vNicIdentifier": { + "description": "vNic identification", + "type": "string" + } + }, + "required": [ "valuesAreSuspect", "vNicIdentifier" ] + }, + "voiceQualityFields": { + "description": "provides statistics related to customer facing voice products", + "type": "object", + "properties": { + "additionalInformation": { + "description": "additional voice quality fields if needed", + "type": "array", + "items": { + "$ref": "#/definitions/field" + } + }, + "calleeSideCodec": { + "description": "callee codec for the call", + "type": "string" + }, + "callerSideCodec": { + "description": "caller codec for the call", + "type": "string" + }, + "correlator": { + "description": "this is the same for all events on this call", + "type": "string" + }, + "endOfCallVqmSummaries": { + "$ref": "#/definitions/endOfCallVqmSummaries" + }, + "phoneNumber": { + "description": "phone number associated with the correlator", + "type": "string" + }, + "midCallRtcp": { + "description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers", + "type": "string" + }, + "vendorVnfNameFields": { + "$ref": "#/definitions/vendorVnfNameFields" + }, + "voiceQualityFieldsVersion": { + "description": "version of the voiceQualityFields block", + "type": "number" + } + }, + "required": [ "calleeSideCodec", "callerSideCodec", "correlator", "midCallRtcp", + "vendorVnfNameFields", "voiceQualityFieldsVersion" ] + } + }, + "title": "Event Listener", + "type": "object", + "properties": { + "event": {"$ref": "#/definitions/event"} + } +} diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/DMaaP.py b/test/csit/tests/dcaegen2/prh_testcases/resources/DMaaP.py new file mode 100644 index 000000000..6daf59b5b --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/DMaaP.py @@ -0,0 +1,157 @@ +import BaseHTTPServer +import json +import posixpath +import sys +import urllib +from Queue import Queue + +import jsonschema +from robot.api import logger + +try: + from cStringIO import StringIO +except ImportError: + from StringIO import StringIO + +CommonEventSchemaV5 = "./CommonEventFormat_28.3.json" +EvtSchema = None +EventQueue = {"defaultTopic": Queue()} + + +def cleanUpEvent(topic="defaultTopic"): + try: + EventQueue.get(topic).empty() + except Exception as e: + logger.console(str(e)) + logger.console("DMaaP Event enqueue failed") + + +def enqueEvent(evt, topic="defaultTopic"): + if topic not in EventQueue.keys(): + EventQueue.update({topic: Queue()}) + + try: + EventQueue.get(topic).put(evt) + logger.console("DMaaP Event enqued - size=" + str(len(evt))) + return True + except Exception as e: + logger.console(str(e)) + logger.console("DMaaP Event enqueue failed") + return False + + +def dequeEvent(topic="defaultTopic", waitSec=10): + try: + evt = EventQueue.get(topic).get(True, waitSec) + logger.console("DMaaP Event dequeued - size=" + str(len(evt))) + return evt + except Exception as e: + logger.console(str(e)) + logger.console("DMaaP Event dequeue failed") + return None + + +class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler): + + def do_PUT(self): + self.send_response(405) + return + + def do_PATCH(self): + self.send_response(200) + return + + def do_POST(self): + + respCode = 0 + + if 'POST' not in self.requestline: + respCode = 405 + + if respCode == 0: + content_len = int(self.headers.getheader('content-length', 0)) + post_body = self.rfile.read(content_len) + + logger.console("DMaaP Receive Event:\n" + post_body) + + indx = post_body.index("{") + if indx != 0: + post_body = post_body[indx:] + + topic = self.getTopicName(self.path) + + if topic is not None: + logger.console("DMaaP Topic Name: " + topic) + if enqueEvent(post_body, topic) == False: + print "enque event fails" + + global EvtSchema + try: + if EvtSchema is None: + with open(CommonEventSchemaV5) as file: + EvtSchema = json.load(file) + decoded_body = json.loads(post_body) + jsonschema.validate(decoded_body, EvtSchema) + except: + respCode = 400 + + if respCode == 0: + if 'clientThrottlingState' in self.requestline: + self.send_response(204) + else: + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + self.wfile.write("{\"count\": 1, \"serverTimeMs\": 3}") + self.wfile.close() + else: + self.send_response(respCode) + + return + + def do_GET(self): + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + self.wfile.write(dequeEvent(self.getTopicName(self.path))) + self.wfile.close() + + return + + def getTopicName(self, path): + # abandon query parameters + path = path.split('?',1)[0] + path = path.split('#',1)[0] + + path = posixpath.normpath(urllib.unquote(path)) + parts = filter(None, path.split('/')) + + if len(parts) > 1 and parts[0] == "events": + return str(parts[1]) + else: + return None + +def _main_ (HandlerClass = DMaaPHandler, + ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): + + if sys.argv[1:]: + port = int(sys.argv[1]) + else: + port = 2222 + + print "Load event schema file: " + CommonEventSchemaV5 + with open(CommonEventSchemaV5) as file: + global EvtSchema + EvtSchema = json.load(file) + + server_address = ('', port) + + HandlerClass.protocol_version = protocol + httpd = ServerClass(server_address, HandlerClass) + + sa = httpd.socket.getsockname() + print "Serving HTTP on", sa[0], "port", sa[1], "..." + httpd.serve_forever() + +if __name__ == '__main__': + _main_() \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/Dockerfile b/test/csit/tests/dcaegen2/prh_testcases/resources/Dockerfile new file mode 100644 index 000000000..e8d1cc178 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/Dockerfile @@ -0,0 +1,13 @@ +FROM python:2 + +ENV https_proxy "$https_proxy" +#ENV TZ=Europe/Warsaw + +ADD DMaaP.py / +ADD CommonEventFormat_28.3.json / + +RUN pip install jsonschema robotframework + +EXPOSE 2222 + +CMD [ "python", "./DMaaP.py" ] \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml b/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml new file mode 100644 index 000000000..7d1fcd5cf --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml @@ -0,0 +1,29 @@ +version: '2' +services: + prh: + image: nexus3.onap.org:10003/onap/org.onap.dcaegen2.services.prh.prh-app-server + command: > + --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222 + --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222 + --aai.aaiClientConfiguration.aaiHostPortNumber=2222 + --aai.aaiClientConfiguration.aaiProtocol=http + entrypoint: + - java + - -Dspring.profiles.active=dev + - -Dlogging.level.org.onap.dcaegen2.services.prh=TRACE + - -jar + - /opt/prh-app-server.jar + ports: + - "8100:8100" + - "8433:8433" + container_name: prh + dmaap_simulator: + build: + context: . + args: + - https_proxy=${HTTPS_PROXY} + ports: + - "2222:2222" + container_name: dmaap_simulator + depends_on: + - prh \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json b/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json new file mode 100644 index 000000000..2351fa4ff --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json @@ -0,0 +1 @@ +{"event": {"commonEventHeader": {"sourceId":"QTFCOC540002E", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC540002E-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", "pnfVendorName":"Nokia", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"10.16.123.234", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC540002E", "pnfManufactureDate":1516406400}}} \ No newline at end of file -- cgit 1.2.3-korg From 43159fb7eac4f385e6aa45740c26698f6077560a Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 25 May 2018 08:08:36 -0700 Subject: Bug fix on OOM deploy script Change-Id: I2ddaa3cbfdebdc5c007ed077f92dfca51c904eb5 Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index 98ba2bd6a..aaf5924e7 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -71,7 +71,7 @@ if [ "$ROBOT_POD" == "" ]; then exit 1 fi -LOG_DIR=$(echo "kubectl exec -n onap $ROBOT_POD -- ls -1t /share/logs | grep {robot-tag} | head -1" | ssh -i $SSH_KEY ubuntu@$RANCHER_IP sudo su) +LOG_DIR=$(echo "kubectl exec -n onap $ROBOT_POD -- ls -1t /share/logs | grep health | head -1" | ssh -i $SSH_KEY ubuntu@$RANCHER_IP sudo su) if [ "$LOG_DIR" == "" ]; then exit 1 fi -- cgit 1.2.3-korg From b2341a5b10c1dd57f19fdeb8fd19ed820dcaa2eb Mon Sep 17 00:00:00 2001 From: Pawel Kadlubanski Date: Fri, 25 May 2018 15:58:11 +0200 Subject: Correction in pom. Issue-ID: INT-458 Change-Id: I66d7a6458b38ee5394c6b4f9449223ed29502c3c Signed-off-by: Pawel Kadlubanski --- test/mocks/pnfsimulator/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml index 105cd03cf..040f37023 100644 --- a/test/mocks/pnfsimulator/pom.xml +++ b/test/mocks/pnfsimulator/pom.xml @@ -18,6 +18,7 @@ latest libs ${project.build.directory}/${dependency.directory.name} + nexus3.onap.org:10003 @@ -120,8 +121,9 @@ docker-maven-plugin 1.0.0 - ${project.name} + ${onap.nexus.dockerregistry.daily}/onap/${project.artifactId} ${docker.image.tag} + ${onap.nexus.dockerregistry.daily} openjdk:8-jdk-alpine java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class} -- cgit 1.2.3-korg From 63c38ed0cb6700d5c87848e4c6a0618063ac1b69 Mon Sep 17 00:00:00 2001 From: wejs Date: Fri, 25 May 2018 17:13:57 +0200 Subject: Correction of testplan.txt Init PRH testcase Change-Id: Ia522945cdfe55df31b2ecdd4d244c62f56e126f4 Issue-ID: INT-510 Signed-off-by: wejs --- test/csit/plans/dcaegen2/prh_testsuites/testplan.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt b/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt index 480dc6409..8c1f3274a 100644 --- a/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt +++ b/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt @@ -1,3 +1,3 @@ # Test suites are relative paths under [integration.git]/test/csit/tests/. # Place the suites in run order. -prh/testcases +dcaegen2/prh_testcases -- cgit 1.2.3-korg From b05d1878be1633b78cc2b9c4646990bd50e7c10f Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 16 May 2018 10:32:44 +0530 Subject: Set CLI docker version Issue-ID: CLI-114 Change-Id: I34f2a7caf83e3b3a315743e1078a71c7ffdf422a Signed-off-by: Kanagaraj Manickam k00365106 --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index ababb1c75..6b9835865 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -22,7 +22,7 @@ onap/ccsdk-odl-image,0.2-STAGING-latest onap/ccsdk-odlsli-image,0.2-STAGING-latest onap/champ,1.2-STAGING-latest onap/clamp,2.0-STAGING-latest -onap/cli,2.0-STAGING-latest +onap/cli,2.0.2 onap/data-router,1.2-STAGING-latest onap/dmaap/buscontroller,latest onap/dmaap/dmaap-mr,1.1.4 -- cgit 1.2.3-korg From df3a25aadc1e884d7fb1a67b4a549a519ececa81 Mon Sep 17 00:00:00 2001 From: Mariusz Wagner Date: Mon, 28 May 2018 10:05:08 +0200 Subject: Fixed errors - error in docker-compose file - error in robot file Issue-ID: INT-510 Change-Id: I11aeb8f55e7b66a5693fb82a666037ef8ff67982 Signed-off-by: Mariusz Wagner --- test/csit/plans/dcaegen2/prh_testsuites/setup.sh | 4 ++-- test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh index 9b1dbd396..012d4c5d9 100644 --- a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh +++ b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh @@ -5,7 +5,7 @@ source ${SCRIPTS}/common_functions.sh export PRH_SERVICE="prh" export DMAAP_SIMULATOR="dmaap_simulator" -cd ${WORKSPACE}/test/csit/tests/prh/testcases/resources/ +cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/resources/ docker login -u docker -p docker nexus3.onap.org:10003 docker-compose up -d @@ -47,4 +47,4 @@ sed -i -e 's/"aaiHost":.*/"aaiHost": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/pr docker cp ${WORKDIR}/prh_endpoints.json prh:/config/ #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v PRH:localhost:8100" \ No newline at end of file +ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v PRH:localhost:8100" diff --git a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot b/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot index bb7e3cac1..ec21b39fb 100644 --- a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot +++ b/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot @@ -9,7 +9,7 @@ Library String ${PNF_REGISTER_URL} http://${DMAAP_SIMULATOR}/events/unauthenticated.SEC_OTHER_OUTPUT ${PNF_READY_URL} http://${DMAAP_SIMULATOR}/events/pnfReady ${PRH_START_URL} http://${PRH}/start -${PNF_REGISTER_EVENT} %{WORKSPACE}/test/csit/tests/prh/testcases/resources/events/pnf_register_event.json +${PNF_REGISTER_EVENT} %{WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json *** Test Cases *** @@ -45,4 +45,4 @@ GetCall [Arguments] ${url} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= Evaluate requests.get('${url}', headers=${headers}, verify=False) requests - [Return] ${resp} \ No newline at end of file + [Return] ${resp} -- cgit 1.2.3-korg From b701c079d66f7027f30c2f79a98e24c0408d6068 Mon Sep 17 00:00:00 2001 From: ehautot Date: Mon, 28 May 2018 11:10:02 +0200 Subject: Fix integration: remove deploy properties Change-Id: I3abf1b6e9a487ce64fb13ce0534b828d6d29bc32 Signed-off-by: ehautot Issue-ID: CLAMP-129 --- test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot | 4 ++-- test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot b/test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot index f400156d1..32b4ce7ec 100644 --- a/test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot +++ b/test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot @@ -78,8 +78,8 @@ Deploy Holmes CL Click Element xpath=//*[@id="navbar"]/ul/li[2]/a Wait Until Element Is Visible locator=Deploy timeout=60 Click Element locator=Deploy - Wait Until Element Is Visible xpath=//*[@id="deployProperties"] timeout=60 - Input Text xpath=//*[@id="deployProperties"] text={} +# Wait Until Element Is Visible xpath=//*[@id="deployProperties"] timeout=60 +# Input Text xpath=//*[@id="deployProperties"] text={} Click Button locator=Deploy Click Button locator=Yes Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60 diff --git a/test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot b/test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot index 34c1a71ef..db72f3bbd 100644 --- a/test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot +++ b/test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot @@ -78,8 +78,8 @@ Deploy TCA CL Click Element xpath=//*[@id="navbar"]/ul/li[2]/a Wait Until Element Is Visible locator=Deploy timeout=60 Click Element locator=Deploy - Wait Until Element Is Visible xpath=//*[@id="deployProperties"] timeout=60 - Input Text xpath=//*[@id="deployProperties"] text={} +# Wait Until Element Is Visible xpath=//*[@id="deployProperties"] timeout=60 +# Input Text xpath=//*[@id="deployProperties"] text={} Click Button locator=Deploy Click Button locator=Yes Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60 -- cgit 1.2.3-korg From ae2335539459822eda2abf66b6062aae0795ad24 Mon Sep 17 00:00:00 2001 From: Pawel Kadlubanski Date: Mon, 28 May 2018 11:34:50 +0200 Subject: Correction in created message. Issue-ID: INT-458 Change-Id: Ic66e27bc89eea194769d54dd367a9a09d484d87f Signed-off-by: Pawel Kadlubanski --- .../pnfsimulator/message/MessageConstants.java | 3 +- .../onap/pnfsimulator/message/MessageProvider.java | 11 ++++-- .../pnfsimulator/message/MessageProviderTest.java | 45 +++++++++++++--------- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java index b49c1ea1d..5805a88c7 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java @@ -17,11 +17,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - + package org.onap.pnfsimulator.message; public final class MessageConstants { + public static final String EVENT = "event"; public static final String DOMAIN = "domain"; public static final String EVENT_ID = "eventId"; public static final String EVENT_TYPE = "eventType"; diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java index 163d4e62d..94f5fc167 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java @@ -35,13 +35,12 @@ import static org.onap.pnfsimulator.message.MessageConstants.PRIORITY; import static org.onap.pnfsimulator.message.MessageConstants.SEQUENCE; import static org.onap.pnfsimulator.message.MessageConstants.START_EPOCH_MICROSEC; import static org.onap.pnfsimulator.message.MessageConstants.VERSION; +import static org.onap.pnfsimulator.message.MessageConstants.EVENT; import java.util.Map; import java.util.UUID; import com.google.common.base.Preconditions; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.json.JSONObject; public class MessageProvider { @@ -72,8 +71,11 @@ public class MessageProvider { } }); - root.put(COMMON_EVENT_HEADER, commonEventHeader); - root.put(OTHER_FIELDS, otherFields); + JSONObject event = new JSONObject(); + event.put(COMMON_EVENT_HEADER, commonEventHeader); + event.put(OTHER_FIELDS, otherFields); + + root.put(EVENT, event); return root; } @@ -91,6 +93,7 @@ public class MessageProvider { commonEventHeader.put(START_EPOCH_MICROSEC, timestamp); commonEventHeader.put(INTERNAL_HEADER_FIELDS, new JSONObject()); commonEventHeader.put(VERSION, 3); + commonEventHeader.put("functionalRole", "test_rola"); return commonEventHeader; } diff --git a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java index 38540577e..bfd222dc2 100644 --- a/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java +++ b/test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java @@ -1,22 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * org.onap.integration + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.onap.pnfsimulator.message; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.onap.pnfsimulator.message.MessageConstants.COMMON_EVENT_HEADER; -import static org.onap.pnfsimulator.message.MessageConstants.DOMAIN; -import static org.onap.pnfsimulator.message.MessageConstants.EVENT_ID; -import static org.onap.pnfsimulator.message.MessageConstants.EVENT_TYPE; -import static org.onap.pnfsimulator.message.MessageConstants.INTERNAL_HEADER_FIELDS; -import static org.onap.pnfsimulator.message.MessageConstants.LAST_EPOCH_MICROSEC; -import static org.onap.pnfsimulator.message.MessageConstants.OTHER_FIELDS; -import static org.onap.pnfsimulator.message.MessageConstants.OTHER_FIELDS_VERSION; -import static org.onap.pnfsimulator.message.MessageConstants.PNF_LAST_SERVICE_DATE; -import static org.onap.pnfsimulator.message.MessageConstants.PNF_MANUFACTURE_DATE; -import static org.onap.pnfsimulator.message.MessageConstants.PRIORITY; -import static org.onap.pnfsimulator.message.MessageConstants.SEQUENCE; -import static org.onap.pnfsimulator.message.MessageConstants.START_EPOCH_MICROSEC; -import static org.onap.pnfsimulator.message.MessageConstants.VERSION; +import static org.onap.pnfsimulator.message.MessageConstants.*; import java.util.UUID; import org.json.JSONObject; @@ -45,9 +52,10 @@ public class MessageProviderTest { @Test public void createMessage_should_create_constant_message_when_no_params_specified() { JSONObject message = messageProvider.createMessage(new JSONObject()); + JSONObject event = message.getJSONObject(EVENT); - JSONObject commonEventHeader = message.getJSONObject(COMMON_EVENT_HEADER); - JSONObject otherFields = message.getJSONObject(OTHER_FIELDS); + JSONObject commonEventHeader = event.getJSONObject(COMMON_EVENT_HEADER); + JSONObject otherFields = event.getJSONObject(OTHER_FIELDS); JSONObject expectedCommonEventHeader = generateConstantCommonEventHeader(); JSONObject expectedOtherFields = generateConstantOtherFields(); @@ -69,8 +77,9 @@ public class MessageProviderTest { JSONObject params = new JSONObject(testParamsJson); JSONObject message = messageProvider.createMessage(params); - JSONObject commonEventHeader = message.getJSONObject(COMMON_EVENT_HEADER); - JSONObject otherFields = message.getJSONObject(OTHER_FIELDS); + JSONObject event = message.getJSONObject(EVENT); + JSONObject commonEventHeader = event.getJSONObject(COMMON_EVENT_HEADER); + JSONObject otherFields = event.getJSONObject(OTHER_FIELDS); assertEquals("pnfVal3", otherFields.getString("pnfKey3")); assertEquals("val1", commonEventHeader.getString("key1")); -- cgit 1.2.3-korg From 7197066f3b6e681cc008202e655a5f1c0b95b59f Mon Sep 17 00:00:00 2001 From: ranpollak Date: Tue, 29 May 2018 16:00:41 +0300 Subject: VF creation as base for more Tests on SCD Issue-ID: INT-300 Change-Id: I8d3604b5adaa18bfa0c093fc8fa0fce71c19b869 Signed-off-by: ranpollak --- S3Ptools/Jmeter/000-VF_creation_Ran_New.jmx | 1627 +++++++++++++++++++++++++++ 1 file changed, 1627 insertions(+) create mode 100644 S3Ptools/Jmeter/000-VF_creation_Ran_New.jmx diff --git a/S3Ptools/Jmeter/000-VF_creation_Ran_New.jmx b/S3Ptools/Jmeter/000-VF_creation_Ran_New.jmx new file mode 100644 index 000000000..1ad296a1c --- /dev/null +++ b/S3Ptools/Jmeter/000-VF_creation_Ran_New.jmx @@ -0,0 +1,1627 @@ + + + + + + true + true + + + + ASDC_SETUP + ${__P(setup,yonadav-build-11856-date-2018-01-0813-19-29)} + = + + + NUM_OF_THREAD + ${__P(iterations,1)} + = + + + TEST_DURATION + ${__P(Duration,1)} + = + + + MAIN_THREAD_GROUP_CNT + ${__P(loops,1)} + = + + + branch + ${__P(workspace,/root/asdc_main/)} + = + + + + + true + + + + + + ################## Test-Params ################## + ############################################## + ############################################## + = + + + TestName + 000-VF_creation.log + = + + + step + 0 + = + + + product + ASDC_Full_distro + = + + + dashboard_path + /sdc1/proxy-designer1#/dashboard + = + + + service_name + Internet_${__RandomString(5,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz,)} + = + + + fileRepo + /${branch}/TestsProperties/HEATFiles/ + = + + + file + 1.zip + = + + + zip + application/zip + = + + + ##################### URL #################### + ############################################## + ############################################## + = + + + port + 8285 + = + + + protocol + http + = + + + ############################################## + ############################################## + ############################################## + = + + + ValidFileName + vDBE.zip + = + + + file + vDBE.zip + = + 1118-nested2nestedResourceGroup.zip + + + HTTP_Tester_ATTUID + jm0007 + = + + + HTTP_OPS_ATTUID + op0001 + = + + + attvdi142 + + + + continue + + false + 1 + + 1 + 1 + 1422885662000 + 1422885662000 + false + + + + + + + + Accept + application/json + + + Content-Type + application/json + + + ${__P(HTTP_REST_USER_ID_HEADER_NAME)} + ${__P(HTTP_REST_USER_ID_HEADER_VALUE)} + + + + + + ../_JMeter_Test_Fragments/BE/Test_Init.jmx + + + + + continue + + false + ${MAIN_THREAD_GROUP_CNT} + + ${NUM_OF_THREAD} + ${TEST_DURATION} + 1422885662000 + 1422885662000 + false + + + + + + true + 1 + + + + + + + + Accept + application/json + + + Content-Type + application/json + + + ${__P(HTTP_REST_USER_ID_HEADER_NAME)} + ${__P(HTTP_REST_USER_ID_HEADER_VALUE)} + + + Accept - application/octet-stream + + + + ../_JMeter_Test_Fragments/BE/VLM/Create_Single_VLM.jmx + + + + ../_JMeter_Test_Fragments/BE/VLM_Entitlement_Pools/Create_Single_EP.jmx + + + + ../_JMeter_Test_Fragments/BE/VLM_License_Key_Groups/Create_Single_LKG.jmx + + + + ../_JMeter_Test_Fragments/BE/VLM_Feature_Groups/Create_Single_Feature_Group.jmx + + + + ../_JMeter_Test_Fragments/BE/VLM_License_Agreements/Create_Single_License_Agreement.jmx + + + + ../_JMeter_Test_Fragments/BE/VLM/Commit_VLM.jmx + + + + ../_JMeter_Test_Fragments/BE/VLM/Submit_VLM.jmx + + + + ../_JMeter_Test_Fragments/BE/VLM/Get_VLM_Version_ID_and_Label.jmx + + + + + + ../_JMeter_Test_Fragments/BE/VSP/Create_Single_VSP.jmx + + + + ../_JMeter_Test_Fragments/BE/VSP/Upload_ZIP_File_To_VSP.jmx + + + + ../_JMeter_Test_Fragments/BE/VSP_Processes/Validation_Save_Process.jmx + + + + ../_JMeter_Test_Fragments/BE/VSP/Commit_VSP.jmx + + + + ../_JMeter_Test_Fragments/BE/VSP/Submit_VSP.jmx + + + + ../_JMeter_Test_Fragments/BE/VSP/Get_VSP_Version_ID_and_Label.jmx + + + + ../_JMeter_Test_Fragments/BE/VSP/Translate_ZIP_file.jmx + + + + false + 0 + mkdir + + + + + -p + = + + + + /tmp/${__TestPlanName}_${__P(VSP_P)} + = + + + + + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_VSP)}/${__P(PKG)}/${__P(VSP_P)} + GET + true + false + true + false + HttpClient3.1 + false + + + + + + + ${__P(HTTP_REST_USER_ID_HEADER_NAME)} + ${__P(HTTP_REST_USER_ID_HEADER_VALUE)} + + + Accept + application/octet-stream + + + Accept - application/octet-stream + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + /tmp/${__TestPlanName}_${__P(VSP_P)}/${__P(VSP_P)}.zip + false + true + true + true + + + + false + + + //String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Download Package "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + //p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + //p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + + + true + true + true + false + + + + ../_JMeter_Test_Fragments/BE/VF/Create_Single_VF.jmx + + + + ../_JMeter_Test_Fragments/BE/VF/Create_VF_Service.jmx + + + + + + ${__eval(${__FileToString(${branch}/TestsProperties/ASDC/VF_service_props.txt)})} + + + false + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(${branch}/TestsProperties/ASDC/VF_service_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_SERVICES)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + + + Accept + application/json + + + Content-Type + application/json + + + ${__P(HTTP_REST_USER_ID_HEADER_NAME)} + ${__P(HTTP_REST_USER_ID_HEADER_VALUE)} + + + Accept - application/octet-stream + + + + false + VFresourceinstance + "uniqueId":"(.+?)\. + $1$ + 0 + 1 + + + + + false + VFSumbit + "uniqueId":"(.+?)\. + $1$ + 0 + 1 + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +props.put("VFinstance_P","${VFresourceinstance}"); +p.println("\n#######################"+"Create VF Service "+"#######################"); +if (ResponseCode.contains("201")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create VF Service failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 1 + + + + 300 + + + + + ${__eval(${__FileToString(${branch}/TestsProperties/ASDC/VF_resourceInstance_props.txt)})} + + + false + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(${branch}/TestsProperties/ASDC/VF_resourceInstance_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_SERVICES)}/${__P(VFinstance_P)}/${__P(ResourceInstance)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + + + Accept + application/json + + + Content-Type + application/json + + + ${__P(HTTP_REST_USER_ID_HEADER_NAME)} + ${__P(HTTP_REST_USER_ID_HEADER_VALUE)} + + + Accept - application/octet-stream + + + + false + VFSumbit + "uniqueId":"(.+?)\. + $1$ + 0 + 1 + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +p.println("\n#######################"+"Create VF resourceinstance "+"#######################"); +if (ResponseCode.contains("201")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create VFresourceinstance failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 1 + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(${branch}/TestsProperties/ASDC/VF_Checkin_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_SERVICES)}/${__P(VFinstance_P)}/${__P(LifecycleState)}/${__P(CertificationRequest)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + + + Accept + application/json + + + Content-Type + application/json + + + ${__P(HTTP_REST_USER_ID_HEADER_NAME)} + ${__P(HTTP_REST_USER_ID_HEADER_VALUE)} + + + Accept - application/octet-stream + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Submit VFresourceinstance "+"#######################"); +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Submit VFresourceinstance name from response failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 1 + + + + 300 + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_SERVICES)}/${__P(VFinstance_P)}/${__P(LifecycleState)}/${__P(StartCertification)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + + + Accept + application/json + + + Content-Type + application/json + + + ${__P(HTTP_REST_USER_ID_HEADER_NAME)} + ${HTTP_Tester_ATTUID} + + + Accept - application/octet-stream + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +props.put("parentUniqueId_P","${parentUniqueId}"); + +p.println("\n#######################"+" Start VFresourceinstance "+"#######################"); +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Start VFresourceinstance failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 1 + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(${branch}/TestsProperties/ASDC/VF_Checkin_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_SERVICES)}/${__P(VFinstance_P)}/${__P(LifecycleState)}/${__P(Certify)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + + + Accept + application/json + + + Content-Type + application/json + + + ${__P(HTTP_REST_USER_ID_HEADER_NAME)} + ${HTTP_Tester_ATTUID} + + + Accept - application/octet-stream + + + + false + VFAccept + "ownerId":"(.+?)\. + $1$ + 0 + 1 + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +props.put("VFAccept_P","${VFAccept}"); +p.println("\n#######################"+" Accept VFresourceinstance "+"#######################"); +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Accept VFresourceinstance failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 1 + + + + 300 + + + + + + + ../_JMeter_Test_Fragments/BE/Show_log.jmx + + + + + continue + + false + ${MAIN_THREAD_GROUP_CNT} + + ${NUM_OF_THREAD} + ${TEST_DURATION} + 1422885662000 + 1422885662000 + false + + + + + + + + Accept + application/json + + + Content-Type + application/json + + + + + + false + 0 + rm + + + + + -rf + = + + + + /tmp/${__TestPlanName}_${__P(VSP_P)}/ + = + + + + + + + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + http + + ${__P(ASDC_VSP)}/${__P(vspId)}/versions/${__P(vspNewVersionID_p)} + DELETE + true + false + true + false + HttpClient4 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Delete Temporary VSP "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Delete VSP REST failed."); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + false + 0 + cat + + + + + ${TestName} + = + + + + + + + /tmp/TestResult/ + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/ResponseCodesPerSecond.jtl + 1000 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/ResponseTimesDistribution.jtl + 100 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/ResponseTimesOverTime.jtl + 500 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/ResponseTimesPercentiles.jtl + 500 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/HitsPerSecond.jtl + 1000 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + true + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + /tmp/TestResult/ResultsTable.xml + + + + + true + + + + + + false + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + + +vars.put("ResponseCode",ResponseCode); +vars.put("ResponseString",ResponseString); +vars.put("ResponseMessage",ResponseMessage); + + + + + -- cgit 1.2.3-korg From 9a3df0007955332a0eb8fc5f34908ba097258e5f Mon Sep 17 00:00:00 2001 From: Maciej Wejs Date: Wed, 30 May 2018 11:28:30 +0200 Subject: Add IntelliJ project files to .gitignore Change-Id: Iaf98ae264d17a70ec4662428c987badfdb026b10 Issue-ID: INT-510 Signed-off-by: Maciej Wejs --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 209db726c..4126c2c6f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ env.properties .DS_Store devtool/ seccom/ +.idea +*.iml + -- cgit 1.2.3-korg From 6c76239eea08066bdaf352326e92b161904cf1a1 Mon Sep 17 00:00:00 2001 From: Kang Xi Date: Wed, 30 May 2018 09:27:34 -0400 Subject: Support multiple customer instantiation Issue-ID: INT-509 Change-Id: I64a934b516f2290812f39c0df2a0d35027a5d553 Signed-off-by: Kang Xi --- .../template.vcpe_brgemu_vfmodule.json | 281 ++++++++++----------- .../template.vcpe_vgw_vfmodule.json | 237 +++++++++-------- .../preload_templates/template_sniro_data.json | 3 + test/vcpe/vcpe.py | 27 +- test/vcpe/vcpe_custom_service.py | 2 + test/vcpe/vcpecommon.py | 124 ++++++--- 6 files changed, 367 insertions(+), 307 deletions(-) diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json index 12303f49a..9a9ecc37d 100644 --- a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json @@ -1,145 +1,138 @@ { - "VNF-API:input": { - "VNF-API:request-information": { - "VNF-API:request-id": "robot12", - "VNF-API:notification-url": "https://so.onap.org", - "VNF-API:order-number": "robot12", - "VNF-API:request-sub-action": "SUPP", - "VNF-API:request-action": "PreloadVNFRequest", - "VNF-API:source": "VID", - "VNF-API:order-version": "1.0" - }, - "VNF-API:sdnc-request-header": { - "VNF-API:svc-action": "reserve", - "VNF-API:svc-notification-url": "https://son.onap.org", - "VNF-API:svc-request-id": "robot12" - }, - "VNF-API:vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-type": "${vnf_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}", - "vnf-name": "${vnf_name}" - }, - "VNF-API:vnf-parameters": [ - - - { - "vnf-parameter-name": "vcpe_image_name", - "vnf-parameter-value": "vbrg-base-ubuntu-16-04-new" - }, - { - "vnf-parameter-name": "vcpe_flavor_name", - "vnf-parameter-value": "m1.medium" - }, - - { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "${public_net_id}" - }, - { - "vnf-parameter-name": "vbrgemu_bng_private_net_id", - "vnf-parameter-value": "${brg_bng_net}" - }, - { - "vnf-parameter-name": "vbrgemu_bng_private_subnet_id", - "vnf-parameter-value": "${brg_bng_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "${oam_onap_net}" - }, - { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "${oam_onap_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, - - { - "vnf-parameter-name": "compile_state", - "vnf-parameter-value": "done" - }, - { - "vnf-parameter-name": "vbrgemu_bng_private_net_cidr", - "vnf-parameter-value": "10.3.0.0/24" - }, - { - "vnf-parameter-name": "vbrgemu_private_ip_0", - "vnf-parameter-value": "10.3.0.14" - }, - { - "vnf-parameter-name": "sdnc_ip", - "vnf-parameter-value": "10.0.7.1" - }, - { - "vnf-parameter-name": "vbrgemu_name_0", - "vnf-parameter-value": "zdcpe1cpe01brgemu01_${suffix}" - }, - { - "vnf-parameter-name": "vnf_id", - "vnf-parameter-value": "vCPE_Infrastructure_BGREMU_demo_app" - }, - { - "vnf-parameter-name": "vf_module_id", - "vnf-parameter-value": "vCPE_Customer_BRGEMU" - }, - { - "vnf-parameter-name": "repo_url_blob", - "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" - }, - { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" - }, - { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.1.1" - }, - { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.1.1" - }, - { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "vbrgemu_key" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - }, - { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - }, - { - "vnf-parameter-name": "vpp_source_repo_url", - "vnf-parameter-value": "https://gerrit.fd.io/r/vpp" - }, - { - "vnf-parameter-name": "vpp_source_repo_branch", - "vnf-parameter-value": "stable/1704" - }, - { - "vnf-parameter-name": "hc2vpp_source_repo_url", - "vnf-parameter-value": "https://gerrit.fd.io/r/hc2vpp" - }, - { - "vnf-parameter-name": "hc2vpp_source_repo_branch", - "vnf-parameter-value": "stable/1704" - }, - { - "vnf-parameter-name": "vpp_patch_url", - "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch" - } - - ], - "VNF-API:vnf-assignments": { - } - } - } -} - + "VNF-API:input": { + "VNF-API:request-information": { + "VNF-API:notification-url": "https://so.onap.org", + "VNF-API:order-number": "robot12", + "VNF-API:order-version": "1.0", + "VNF-API:request-action": "PreloadVNFRequest", + "VNF-API:request-id": "robot12", + "VNF-API:request-sub-action": "SUPP", + "VNF-API:source": "VID" + }, + "VNF-API:sdnc-request-header": { + "VNF-API:svc-action": "reserve", + "VNF-API:svc-notification-url": "https://son.onap.org", + "VNF-API:svc-request-id": "robot12" + }, + "VNF-API:vnf-topology-information": { + "VNF-API:vnf-assignments": {}, + "VNF-API:vnf-parameters": [ + { + "vnf-parameter-name": "vcpe_image_name", + "vnf-parameter-value": "vbrg-base-ubuntu-16-04-new" + }, + { + "vnf-parameter-name": "vcpe_flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "${public_net_id}" + }, + { + "vnf-parameter-name": "vbrgemu_bng_private_net_id", + "vnf-parameter-value": "${brg_bng_net}" + }, + { + "vnf-parameter-name": "vbrgemu_bng_private_subnet_id", + "vnf-parameter-value": "${brg_bng_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "${oam_onap_net}" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "${oam_onap_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "compile_state", + "vnf-parameter-value": "done" + }, + { + "vnf-parameter-name": "vbrgemu_bng_private_net_cidr", + "vnf-parameter-value": "10.3.0.0/24" + }, + { + "vnf-parameter-name": "vbrgemu_private_ip_0", + "vnf-parameter-value": "10.3.0.21" + }, + { + "vnf-parameter-name": "sdnc_ip", + "vnf-parameter-value": "10.0.7.1" + }, + { + "vnf-parameter-name": "vbrgemu_name_0", + "vnf-parameter-value": "zdcpe1cpe01brgemu01_${suffix}" + }, + { + "vnf-parameter-name": "vnf_id", + "vnf-parameter-value": "vCPE_Infrastructure_BGREMU_demo_app_${suffix}" + }, + { + "vnf-parameter-name": "vf_module_id", + "vnf-parameter-value": "vCPE_Customer_BRGEMU_${suffix}" + }, + { + "vnf-parameter-name": "repo_url_blob", + "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" + }, + { + "vnf-parameter-name": "repo_url_artifacts", + "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + }, + { + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "1.1.1" + }, + { + "vnf-parameter-name": "install_script_version", + "vnf-parameter-value": "1.1.1" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "vbrgemu_key" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "${pub_key}" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + }, + { + "vnf-parameter-name": "vpp_source_repo_url", + "vnf-parameter-value": "https://gerrit.fd.io/r/vpp" + }, + { + "vnf-parameter-name": "vpp_source_repo_branch", + "vnf-parameter-value": "stable/1704" + }, + { + "vnf-parameter-name": "hc2vpp_source_repo_url", + "vnf-parameter-value": "https://gerrit.fd.io/r/hc2vpp" + }, + { + "vnf-parameter-name": "hc2vpp_source_repo_branch", + "vnf-parameter-value": "stable/1704" + }, + { + "vnf-parameter-name": "vpp_patch_url", + "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch" + } + ], + "vnf-topology-identifier": { + "generic-vnf-name": "${generic_vnf_name}", + "generic-vnf-type": "${generic_vnf_type}", + "service-type": "${service_type}", + "vnf-name": "${vnf_name}", + "vnf-type": "${vnf_type}" + } + } + } +} \ No newline at end of file diff --git a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json index 8b33482ab..d955a1d9c 100644 --- a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json @@ -1,121 +1,118 @@ { - "VNF-API:input": { - "VNF-API:request-information": { - "VNF-API:request-id": "robot12", - "VNF-API:notification-url": "https://so.onap.org", - "VNF-API:order-number": "robot12", - "VNF-API:request-sub-action": "SUPP", - "VNF-API:request-action": "PreloadVNFRequest", - "VNF-API:source": "VID", - "VNF-API:order-version": "1.0" - }, - "VNF-API:sdnc-request-header": { - "VNF-API:svc-action": "reserve", - "VNF-API:svc-notification-url": "https://son.onap.org", - "VNF-API:svc-request-id": "robot12" - }, - "VNF-API:vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "VGW-SERVICE-TYPE", - "vnf-type": "VGW-VNF-TYPE", - "generic-vnf-name": "GENERIC-VGW-VNF-NAME0", - "generic-vnf-type": "GENERIC-VGW-VNF-TYPE", - "vnf-name": "VGW2BRG-${brg_mac}" - }, - "VNF-API:vnf-parameters": [ - - { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "${public_net_id}" - }, - { - "vnf-parameter-name": "mux_gw_private_net_id", - "vnf-parameter-value": "${mux_gw_net}" - }, - { - "vnf-parameter-name": "mux_gw_private_subnet_id", - "vnf-parameter-value": "${mux_gw_subnet}" - }, - { - "vnf-parameter-name": "mux_gw_private_net_cidr", - "vnf-parameter-value": "10.5.0.0/24" - }, - { - "vnf-parameter-name": "cpe_public_net_id", - "vnf-parameter-value": "${cpe_public_net}" - }, - { - "vnf-parameter-name": "cpe_public_subnet_id", - "vnf-parameter-value": "${cpe_public_subnet}" - }, - { - "vnf-parameter-name": "cpe_public_net_cidr", - "vnf-parameter-value": "10.2.0.0/24" - }, - { - "vnf-parameter-name": "vgw_private_ip_0", - "vnf-parameter-value": "10.5.0.22" - }, - { - "vnf-parameter-name": "vgw_private_ip_1", - "vnf-parameter-value": "10.0.101.30" - }, - { - "vnf-parameter-name": "vgw_name_0", - "vnf-parameter-value": "zdcpe1cpe01gw01_${suffix}" - }, - { - "vnf-parameter-name": "mux_ip_addr", - "vnf-parameter-value": "10.5.0.21" - }, - { - "vnf-parameter-name": "vg_vgmux_tunnel_vni", - "vnf-parameter-value": "100" - }, - { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "${oam_onap_net}" - }, - { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "${oam_onap_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, - { - "vnf-parameter-name": "repo_url_blob", - "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" - }, - { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" - }, - { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.1.1" - }, - { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.1.1" - }, - { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "vgw_key" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - }, - { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - } - ], - "VNF-API:vnf-assignments": { - } - } - } -} - + "VNF-API:input": { + "VNF-API:request-information": { + "VNF-API:notification-url": "https://so.onap.org", + "VNF-API:order-number": "robot12", + "VNF-API:order-version": "1.0", + "VNF-API:request-action": "PreloadVNFRequest", + "VNF-API:request-id": "robot12", + "VNF-API:request-sub-action": "SUPP", + "VNF-API:source": "VID" + }, + "VNF-API:sdnc-request-header": { + "VNF-API:svc-action": "reserve", + "VNF-API:svc-notification-url": "https://son.onap.org", + "VNF-API:svc-request-id": "robot12" + }, + "VNF-API:vnf-topology-information": { + "VNF-API:vnf-assignments": {}, + "VNF-API:vnf-parameters": [ + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "${public_net_id}" + }, + { + "vnf-parameter-name": "mux_gw_private_net_id", + "vnf-parameter-value": "${mux_gw_net}" + }, + { + "vnf-parameter-name": "mux_gw_private_subnet_id", + "vnf-parameter-value": "${mux_gw_subnet}" + }, + { + "vnf-parameter-name": "mux_gw_private_net_cidr", + "vnf-parameter-value": "10.5.0.0/24" + }, + { + "vnf-parameter-name": "cpe_public_net_id", + "vnf-parameter-value": "${cpe_public_net}" + }, + { + "vnf-parameter-name": "cpe_public_subnet_id", + "vnf-parameter-value": "${cpe_public_subnet}" + }, + { + "vnf-parameter-name": "cpe_public_net_cidr", + "vnf-parameter-value": "10.2.0.0/24" + }, + { + "vnf-parameter-name": "vgw_private_ip_0", + "vnf-parameter-value": "10.5.0.45" + }, + { + "vnf-parameter-name": "vgw_private_ip_1", + "vnf-parameter-value": "10.0.101.45" + }, + { + "vnf-parameter-name": "vgw_name_0", + "vnf-parameter-value": "zdcpe1cpe01gw01_${suffix}" + }, + { + "vnf-parameter-name": "mux_ip_addr", + "vnf-parameter-value": "10.5.0.21" + }, + { + "vnf-parameter-name": "vg_vgmux_tunnel_vni", + "vnf-parameter-value": "45" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "${oam_onap_net}" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "${oam_onap_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "repo_url_blob", + "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" + }, + { + "vnf-parameter-name": "repo_url_artifacts", + "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + }, + { + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "1.1.1" + }, + { + "vnf-parameter-name": "install_script_version", + "vnf-parameter-value": "1.1.1" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "vgw_key" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "${pub_key}" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + } + ], + "vnf-topology-identifier": { + "generic-vnf-name": "GENERIC-VGW-VNF-NAME0", + "generic-vnf-type": "GENERIC-VGW-VNF-TYPE", + "service-type": "VGW-SERVICE-TYPE", + "vnf-name": "VGW2BRG-${brg_mac}", + "vnf-type": "VGW-VNF-TYPE" + } + } + } +} \ No newline at end of file diff --git a/test/vcpe/preload_templates/template_sniro_data.json b/test/vcpe/preload_templates/template_sniro_data.json index 6fa200395..92c9cc719 100644 --- a/test/vcpe/preload_templates/template_sniro_data.json +++ b/test/vcpe/preload_templates/template_sniro_data.json @@ -7,6 +7,7 @@ "resourceModuleName" : "${tunnelxconn_ar_name}", "serviceInstanceId" : "${vgmux_svc_instance_uuid}", "serviceResourceId" : "TUNNEL-RESOURCE-ID-REPLACE", + "isRehome" : "False", "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] }, { @@ -15,6 +16,7 @@ "resourceModuleName" : "${vgw_name}", "serviceInstanceId" : "vG-service-instance-id", "serviceResourceId" : "VGW-RESOURCE-ID-REPLACE", + "isRehome" : "False", "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] }, { @@ -23,6 +25,7 @@ "resourceModuleName" : "${brg_ar_name}", "serviceInstanceId" : "${vbrg_svc_instance_uuid}", "serviceResourceId" : "BRG-RESOURCE-ID-REPLACE", + "isRehome" : "False", "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] } ] diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py index 7de86ae8d..c4737296b 100755 --- a/test/vcpe/vcpe.py +++ b/test/vcpe/vcpe.py @@ -8,6 +8,7 @@ import preload import vcpe_custom_service import csar_parser import config_sdnc_so +import json def config_sniro(vcpecommon, vgmux_svc_instance_uuid, vbrg_svc_instance_uuid): @@ -49,13 +50,15 @@ def create_one_service(vcpecommon, csar_file, vnf_template_file, preload_dict, s so = soutils.SoUtils(vcpecommon, 'v4') return so.create_entire_service(csar_file, vnf_template_file, preload_dict, suffix, heatbridge) + def deploy_brg_only(): logging.basicConfig(level=logging.INFO, format='%(message)s') logger = logging.getLogger(__name__) vcpecommon = VcpeCommon() preload_dict = vcpecommon.load_preload_data() - name_suffix = preload_dict['${brg_bng_net}'].split('_')[-1] +# name_suffix = preload_dict['${brg_bng_net}'].split('_')[-1] + name_suffix = datetime.now().strftime('%Y%m%d%H%M') # create multiple services based on the pre-determined order svc_instance_uuid = vcpecommon.load_object(vcpecommon.svc_instance_uuid_file) @@ -63,6 +66,7 @@ def deploy_brg_only(): heatbridge = 'gmux' == keyword csar_file = vcpecommon.find_file(keyword, 'csar', 'csar') vnf_template_file = vcpecommon.find_file(keyword, 'json', 'preload_templates') + vcpecommon.increase_ip_address_or_vni_in_template(vnf_template_file, ['vbrgemu_private_ip_0']) svc_instance_uuid[keyword] = create_one_service(vcpecommon, csar_file, vnf_template_file, preload_dict, name_suffix, heatbridge) if not svc_instance_uuid[keyword]: @@ -71,8 +75,8 @@ def deploy_brg_only(): # Setting up SNIRO config_sniro(vcpecommon, svc_instance_uuid['gmux'], svc_instance_uuid['brg']) + def deploy_infra(): - logging.basicConfig(level=logging.INFO, format='%(message)s') logger = logging.getLogger(__name__) vcpecommon = VcpeCommon() @@ -127,12 +131,12 @@ def deploy_custom_service(): custom_service = vcpe_custom_service.CustomService(vcpecommon) # clean up - host_dic = {k: vcpecommon.hosts[k] for k in nodes} - if not vcpecommon.delete_vxlan_interfaces(host_dic): - sys.exit() + #host_dic = {k: vcpecommon.hosts[k] for k in nodes} + #if not vcpecommon.delete_vxlan_interfaces(host_dic): + # sys.exit() - custom_service.clean_up_sdnc() - custom_service.del_all_vgw_stacks(vcpecommon.vgw_name_keyword) + #custom_service.clean_up_sdnc() + #custom_service.del_all_vgw_stacks(vcpecommon.vgw_name_keyword) # create new service csar_file = vcpecommon.find_file('rescust', 'csar', 'csar') @@ -171,6 +175,15 @@ def init_so_sdnc(): config_sdnc_so.insert_customer_service_to_sdnc(vcpecommon) +def tmp_sniro(): + logger = logging.getLogger(__name__) + + vcpecommon = VcpeCommon() + + svc_instance_uuid = vcpecommon.load_object(vcpecommon.svc_instance_uuid_file) + # Setting up SNIRO + config_sniro(vcpecommon, svc_instance_uuid['gmux'], svc_instance_uuid['brg']) + if __name__ == '__main__': logging.basicConfig(level=logging.INFO, format='%(message)s') diff --git a/test/vcpe/vcpe_custom_service.py b/test/vcpe/vcpe_custom_service.py index d89129eef..af76803aa 100755 --- a/test/vcpe/vcpe_custom_service.py +++ b/test/vcpe/vcpe_custom_service.py @@ -72,6 +72,8 @@ class CustomService: # preload vGW if preload_dict: preloader = preload.Preload(self.vcpecommon) + parameters_to_change = ['vgw_private_ip_0', 'vgw_private_ip_1', 'vg_vgmux_tunnel_vni'] + self.vcpecommon.increase_ip_address_or_vni_in_template(vgw_template_file, parameters_to_change) preloader.preload_vgw(vgw_template_file, brg_mac, preload_dict, name_suffix) # create service diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index cac5219ea..0213183e8 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -41,6 +41,7 @@ class VcpeCommon: ############################################################################################# template_variable_symbol = '${' + cpe_vm_prefix = 'zdcpe' ############################################################################################# # preloading network config # key=network role @@ -120,7 +121,7 @@ class VcpeCommon: self.so_db_name = 'mso_catalog' self.so_db_user = 'root' self.so_db_pass = 'password' - self.so_db_port = '32768' + self.so_db_port = '32769' self.vpp_inf_url = 'http://{0}:8183/restconf/config/ietf-interfaces:interfaces' self.vpp_api_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} @@ -138,7 +139,8 @@ class VcpeCommon: def get_brg_mac_from_sdnc(self): """ - :return: BRG MAC address. Currently we only support one BRG instance. + Check table DHCP_MAP in the SDNC DB. Find the newly instantiated BRG MAC address. + Note that there might be multiple BRGs, the most recently instantiated BRG always has the largest IP address. """ cnx = mysql.connector.connect(user=self.sdnc_db_user, password=self.sdnc_db_pass, database=self.sdnc_db_name, host=self.hosts['sdnc'], port=self.sdnc_db_port) @@ -147,36 +149,30 @@ class VcpeCommon: cursor.execute(query) self.logger.debug('DHCP_MAP table in SDNC') - counter = 0 - mac = None + mac_recent = None + host = -1 for mac, ip in cursor: - counter += 1 self.logger.debug(mac + ':' + ip) + this_host = int(ip.split('.')[-1]) + if host < this_host: + host = this_host + mac_recent = mac cnx.close() - if counter != 1: - self.logger.error('Found %s MAC addresses in DHCP_MAP', counter) - sys.exit() - else: - self.logger.debug('Found MAC addresses in DHCP_MAP: %s', mac) - return mac + assert mac_recent + return mac_recent - def insert_into_sdnc_db(self, cmds): - cnx = mysql.connector.connect(user=self.sdnc_db_user, password=self.sdnc_db_pass, database=self.sdnc_db_name, - host=self.hosts['sdnc'], port=self.sdnc_db_port) - cursor = cnx.cursor() - for cmd in cmds: - self.logger.debug(cmd) - cursor.execute(cmd) - self.logger.debug('%s', cursor) - cnx.commit() - cursor.close() - cnx.close() + def execute_cmds_sdnc_db(self, cmds): + self.execute_cmds_db(cmds, self.sdnc_db_user, self.sdnc_db_pass, self.sdnc_db_name, + self.hosts['sdnc'], self.sdnc_db_port) - def insert_into_so_db(self, cmds): - cnx = mysql.connector.connect(user=self.so_db_user, password=self.so_db_pass, database=self.so_db_name, - host=self.hosts['so'], port=self.so_db_port) + def execute_cmds_so_db(self, cmds): + self.execute_cmds_db(cmds, self.so_db_user, self.so_db_pass, self.so_db_name, + self.hosts['so'], self.so_db_port) + + def execute_cmds_db(self, cmds, dbuser, dbpass, dbname, host, port): + cnx = mysql.connector.connect(user=dbuser, password=dbpass, database=dbname, host=host, port=port) cursor = cnx.cursor() for cmd in cmds: self.logger.debug(cmd) @@ -309,18 +305,12 @@ class VcpeCommon: openstackcmd = 'nova ' + param + ' list' self.logger.debug(openstackcmd) - ip_dict = {} results = os.popen(openstackcmd).read() - for line in results.split('\n'): - fields = line.split('|') - if len(fields) == 8: - vm_name = fields[2] - ip_info = fields[-2] - for keyword in keywords: - if keyword in vm_name: - ip = self.extract_ip_from_str(net_addr, net_addr_len, ip_info) - if ip: - ip_dict[keyword] = ip + all_vm_ip_dict = self.extract_vm_ip_as_dict(results, net_addr, net_addr_len) + latest_vm_list = self.remove_old_vms(all_vm_ip_dict.keys(), self.cpe_vm_prefix) + latest_vm_ip_dict = {vm: all_vm_ip_dict[vm] for vm in latest_vm_list} + ip_dict = self.select_subset_vm_ip(latest_vm_ip_dict, keywords) + if len(ip_dict) != len(keywords): self.logger.error('Cannot find all desired IP addresses for %s.', keywords) self.logger.error(json.dumps(ip_dict, indent=4, sort_keys=True)) @@ -328,6 +318,48 @@ class VcpeCommon: # sys.exit() return ip_dict + def extract_vm_ip_as_dict(self, novalist_results, net_addr, net_addr_len): + vm_ip_dict = {} + for line in novalist_results.split('\n'): + fields = line.split('|') + if len(fields) == 8: + vm_name = fields[2] + ip_info = fields[-2] + ip = self.extract_ip_from_str(net_addr, net_addr_len, ip_info) + vm_ip_dict[vm_name] = ip + + return vm_ip_dict + + def remove_old_vms(self, vm_list, prefix): + """ + For vms with format name_timestamp, only keep the one with the latest timestamp. + E.g., + zdcpe1cpe01brgemu01_201805222148 (drop this) + zdcpe1cpe01brgemu01_201805222229 (keep this) + zdcpe1cpe01gw01_201805162201 + """ + new_vm_list = [] + same_type_vm_dict = {} + for vm in vm_list: + fields = vm.split('_') + if vm.startswith(prefix) and len(fields) == 2 and len(fields[-1]) == len('201805222148') and fields[-1].isdigit(): + if vm > same_type_vm_dict.get(fields[0], '0'): + same_type_vm_dict[fields[0]] = vm + else: + new_vm_list.append(vm) + + new_vm_list.extend(same_type_vm_dict.values()) + return new_vm_list + + def select_subset_vm_ip(self, all_vm_ip_dict, vm_name_keyword_list): + vm_ip_dict = {} + for keyword in vm_name_keyword_list: + for vm, ip in all_vm_ip_dict.items(): + if keyword in vm: + vm_ip_dict[keyword] = ip + break + return vm_ip_dict + def del_vgmux_ves_mode(self): url = self.vpp_ves_url.format(self.hosts['mux']) + '/mode' r = requests.delete(url, headers=self.vpp_api_headers, auth=self.vpp_api_userpass) @@ -412,6 +444,26 @@ class VcpeCommon: with open(filepathname, 'rb') as fin: return pickle.load(fin) + @staticmethod + def increase_ip_address_or_vni_in_template(vnf_template_file, vnf_parameter_name_list): + with open(vnf_template_file) as json_input: + json_data = json.load(json_input) + param_list = json_data['VNF-API:input']['VNF-API:vnf-topology-information']['VNF-API:vnf-parameters'] + for param in param_list: + if param['vnf-parameter-name'] in vnf_parameter_name_list: + ipaddr_or_vni = param['vnf-parameter-value'].split('.') + number = int(ipaddr_or_vni[-1]) + if 254 == number: + number = 10 + else: + number = number + 1 + ipaddr_or_vni[-1] = str(number) + param['vnf-parameter-value'] = '.'.join(ipaddr_or_vni) + + assert json_data is not None + with open(vnf_template_file, 'w') as json_output: + json.dump(json_data, json_output, indent=4, sort_keys=True) + def save_preload_data(self, preload_data): self.save_object(preload_data, self.preload_dict_file) -- cgit 1.2.3-korg From 5ae67b78775a5416293c23ebc1ac1caf57d8834d Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 30 May 2018 12:34:41 -0700 Subject: Bump dcae bootstrap to 1.1.3 Bump dcae bootstrap to 1.1.3 to fix missing image issue with 1.1.2. Change-Id: I0bf20f1767dcae0ec1a25fe21ad7ebd673cfffe9 Issue-ID: DCAEGEN2-499 Signed-off-by: Gary Wu --- .gitreview | 4 ---- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 .gitreview diff --git a/.gitreview b/.gitreview deleted file mode 100644 index 6e77300ea..000000000 --- a/.gitreview +++ /dev/null @@ -1,4 +0,0 @@ -[gerrit] -host=gerrit.onap.org -port=29418 -project=integration.git diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 6b9835865..7ccc6383d 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -47,7 +47,7 @@ onap/optf-has,latest onap/optf-osdf,latest onap/org.onap.dcaegen2.collectors.snmptrap,latest onap/org.onap.dcaegen2.collectors.ves.vescollector,latest -onap/org.onap.dcaegen2.deployments.bootstrap,1.1.2 +onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3 onap/org.onap.dcaegen2.deployments.cm-container,latest onap/org.onap.dcaegen2.deployments.healthcheck-container,latest onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,latest -- cgit 1.2.3-korg From fe85d66264bd22bdbefb53274ac0403ea7e58571 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 16 May 2018 12:16:00 +0530 Subject: Update CLI java manifest versions Issue-ID: CLI-114 Change-Id: I59c9c434ceb62281f21bcc0107d1c2d503924da5 Signed-off-by: Kanagaraj Manickam k00365106 --- .../src/main/resources/java-manifest.csv | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 598c4cb85..985936b3d 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -88,17 +88,15 @@ org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.2.1 org.onap.ccsdk.storage.pgaas,pgaas,1.0.0 org.onap.ccsdk.utils,utils,1.0.0 org.onap.clamp.clds.clamp,clamp,2.0.0 -org.onap.cli,cli-framework,2.0.0 -org.onap.cli,cli-main,2.0.0 -org.onap.cli,cli-plugins-aai,2.0.0 -org.onap.cli,cli-plugins-msb,2.0.0 -org.onap.cli,cli-plugins-sample,2.0.0 -org.onap.cli,cli-plugins-sdc,2.0.0 -org.onap.cli,cli-plugins-so,2.0.0 -org.onap.cli,cli-sample-mock-generator,2.0.0 -org.onap.cli,cli-sample-yaml-generator,2.0.0 -org.onap.cli,cli-validation,2.0.0 -org.onap.cli,cli-zip,2.0.0 +org.onap.cli,cli-framework,2.0.2 +org.onap.cli,cli-main,2.0.2 +org.onap.cli,cli-plugins-sample,2.0.2 +org.onap.cli,cli-profiles-http,2.0.2 +org.onap.cli,cli-profiles-snmp,2.0.2 +org.onap.cli,cli-sample-mock-generator,2.0.2 +org.onap.cli,cli-sample-yaml-generator,2.0.2 +org.onap.cli,cli-validation,2.0.2 +org.onap.cli,cli-zip,2.0.2 org.onap.dcaegen2,dcaegen2,1.1.0 org.onap.dcaegen2.analytics.tca,dcae-analytics,2.2.0 org.onap.dcaegen2.analytics.tca,dcae-analytics-aai,2.2.0 -- cgit 1.2.3-korg From 32783b879cc3f3e1f34fb41ded5686d3e2a8fe4b Mon Sep 17 00:00:00 2001 From: "Sonsino, Ofir (os0695)" Date: Wed, 30 May 2018 12:30:19 +0300 Subject: Update VID docker in manifest Change-Id: I7aa793e35743bbdb7d718f208567717056e2ede1 Issue-ID: VID-234 Signed-off-by: Sonsino, Ofir (os0695) --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 7ccc6383d..d504f3768 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -103,7 +103,7 @@ onap/vfc/wfengine-mgrservice,latest onap/vfc/ztesdncdriver,1.1.0-STAGING-latest onap/vfc/ztevmanagerdriver,1.0.3-STAGING-latest onap/vfc/ztevnfmdriver,1.1.0-STAGING-latest -onap/vid,1.2.1 +onap/vid,2.0-STAGING-latest onap/vnfsdk/refrepo,1.1.1 onap/vnfsdk/refrepo/postgres,1.1.1 openecomp/mso,1.2.1 -- cgit 1.2.3-korg From 9155782ec85e141867532627ecc22acee9c61f84 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 30 May 2018 16:58:44 -0400 Subject: Update docker manifest with released aai docker images Issue-ID: AAI-1188 Change-Id: I3853ebb7820ea0e843e2aca62c5e895f9b59dad3 Signed-off-by: Jimmy Forsyth --- .../src/main/resources/docker-manifest.csv | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index d504f3768..d4ba3ee89 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -9,28 +9,28 @@ onap/aaf/aaf_service,2.1.0-SNAPSHOT onap/aaf/authz-service,latest onap/aaf/sms,latest onap/aaf/smsquorumclient,latest -onap/aai-resources,1.2-STAGING-latest -onap/aai-traversal,1.2-STAGING-latest +onap/aai-resources,1.2.1 +onap/aai-traversal,1.2.1 onap/aai/esr-gui,latest onap/aai/esr-server,latest onap/admportal-sdnc-image,1.3-STAGING-latest onap/appc-cdt-image,1.3.0-SNAPSHOT-latest onap/appc-image,1.3.0-SNAPSHOT-latest -onap/babel,1.2-STAGING-latest +onap/babel,1.2.0 onap/ccsdk-dgbuilder-image,0.2-STAGING-latest onap/ccsdk-odl-image,0.2-STAGING-latest onap/ccsdk-odlsli-image,0.2-STAGING-latest -onap/champ,1.2-STAGING-latest +onap/champ,1.2.3 onap/clamp,2.0-STAGING-latest onap/cli,2.0.2 -onap/data-router,1.2-STAGING-latest +onap/data-router,1.2.2 onap/dmaap/buscontroller,latest onap/dmaap/dmaap-mr,1.1.4 onap/externalapi/nbi,latest -onap/gizmo,1.1-STAGING-latest +onap/gizmo,1.2.0 onap/holmes/engine-management,latest onap/holmes/rule-management,latest -onap/model-loader,1.2-STAGING-latest +onap/model-loader,1.2.1 onap/modeling/javatoscachecker,latest onap/msb/msb_apigateway,1.1.0-STAGING-latest onap/msb/msb_discovery,1.1.0-STAGING-latest @@ -79,9 +79,9 @@ onap/sdnc-ansible-server-image,1.3-STAGING-latest onap/sdnc-dmaap-listener-image,1.3-STAGING-latest onap/sdnc-image,1.3-STAGING-latest onap/sdnc-ueb-listener-image,1.3-STAGING-latest -onap/search-data-service,1.2-STAGING-latest +onap/search-data-service,1.2.1 onap/sniroemulator,latest -onap/sparky-be,1.2-STAGING-latest +onap/sparky-be,1.2.1 onap/testsuite,1.2.0 onap/usecase-ui,latest onap/usecase-ui/usecase-ui-server,latest -- cgit 1.2.3-korg From 5d800f06eea2e572009294d8610220b1024d27f1 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 30 May 2018 16:53:57 -0700 Subject: Change default pull policy to IfNotPresent Change-Id: I4d5769a49b0c9d875f6fd18b419ea0ae2ad4dc1e Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/env/gwu/onap.env | 2 +- deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env | 2 +- deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env | 2 +- deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env | 2 +- deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-00.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-01.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-02.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-03.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-04.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-05.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-06.env | 2 +- deployment/heat/onap-oom/env/windriver/Integration-SB-07.env | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env index 2b10306f5..efc263e07 100644 --- a/deployment/heat/onap-oom/env/gwu/onap.env +++ b/deployment/heat/onap-oom/env/gwu/onap.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 192.168.1.51:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://192.168.1.11:5000" openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df" diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env index 4cdd16c54..f50d85a31 100644 --- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env +++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.145.122.118:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.145.122.117:5000" openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4" diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env index ec220dc58..fb9ad20bb 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 192.168.31.204:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackPublicNetId: "__oam_network_id__" diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env index ec220dc58..fb9ad20bb 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 192.168.31.204:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackPublicNetId: "__oam_network_id__" diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env index ec220dc58..fb9ad20bb 100644 --- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env +++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 192.168.31.204:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackPublicNetId: "__oam_network_id__" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env index 8336b504b..20e78f5c0 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env @@ -15,7 +15,7 @@ parameters: integration_override_yaml: > global: repository: 10.12.5.2:5000 - pullPolicy: Always + pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" -- cgit 1.2.3-korg From 54dac21af8c722b2c2dc7c9b714aae3a034f1651 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 29 May 2018 14:02:24 -0400 Subject: Update final policy 1.2.3 artifacts These are the Beijing final released artifacts. Issue-ID: POLICY-844 Change-Id: I704947a0c77ec15a96261e33c79ed32c3cfb6592 Signed-off-by: Pamela Dragosh --- version-manifest/src/main/resources/docker-manifest.csv | 4 ++-- version-manifest/src/main/resources/java-manifest.csv | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index d4ba3ee89..4e290bc74 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -61,8 +61,8 @@ onap/org.onap.dcaegen2.platform.policy-handler,latest onap/org.onap.dcaegen2.platform.servicechange-handler,latest onap/org.onap.dcaegen2.services.heartbeat,latest onap/org.onap.dcaegen2.services.prh.prh-app-server,latest -onap/policy-drools,1.2.2 -onap/policy-pe,1.2.2 +onap/policy-drools,1.2.3 +onap/policy-pe,1.2.3 onap/portal-app,v2.2.0 onap/portal-db,v2.2.0 onap/portal-sdk,v2.2.0 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 985936b3d..f724def08 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -137,10 +137,10 @@ org.onap.multicloud.openstack,windriver,1.0.0 org.onap.multicloud.openstack.vmware,vesagent,1.0.0 org.onap.multicloud.openstack.vmware,vio,1.0.0 org.onap.oparent,oparent,1.1.1 -org.onap.policy.common,common-modules,1.2.2 -org.onap.policy.drools-applications,drools-pdp-apps,1.2.2 -org.onap.policy.drools-pdp,drools-pdp,1.2.2 -org.onap.policy.engine,PolicyEngineSuite,1.2.2 +org.onap.policy.common,common-modules,1.2.3 +org.onap.policy.drools-applications,drools-pdp-apps,1.2.3 +org.onap.policy.drools-pdp,drools-pdp,1.2.3 +org.onap.policy.engine,PolicyEngineSuite,1.2.3 org.onap.portal.sdk,epsdk-analytics,2.2.0 org.onap.portal.sdk,epsdk-app-common,2.2.0 org.onap.portal.sdk,epsdk-app-overlay,2.2.0 -- cgit 1.2.3-korg From e426b0f83f459f8c92f5546c1fdec7720a10dc61 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 31 May 2018 06:41:47 -0700 Subject: Update VID docker in manifest Change-Id: I71f5ed08ebcac8b03933747d5911b88094e69148 Issue-ID: VID-234 Signed-off-by: Gary Wu --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 4e290bc74..377158ac5 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -103,7 +103,7 @@ onap/vfc/wfengine-mgrservice,latest onap/vfc/ztesdncdriver,1.1.0-STAGING-latest onap/vfc/ztevmanagerdriver,1.0.3-STAGING-latest onap/vfc/ztevnfmdriver,1.1.0-STAGING-latest -onap/vid,2.0-STAGING-latest +onap/vid,2.0.0 onap/vnfsdk/refrepo,1.1.1 onap/vnfsdk/refrepo/postgres,1.1.1 openecomp/mso,1.2.1 -- cgit 1.2.3-korg From aa430e329ec3bebfa6a6e0d2bac104324e2d9370 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 31 May 2018 11:22:45 -0700 Subject: Set override to enable SDNC clustering Also disable log pods in all Wind River SB environments to avoid VM crashing issue. Change-Id: Ide0667961cd84678ceff43d53298600fde68080c Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env | 4 ++++ deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env | 4 ++++ deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env | 4 ++++ deployment/heat/onap-oom/env/windriver/Integration-SB-00.env | 6 ++++++ deployment/heat/onap-oom/env/windriver/Integration-SB-01.env | 6 ++++++ deployment/heat/onap-oom/env/windriver/Integration-SB-02.env | 6 ++++++ deployment/heat/onap-oom/env/windriver/Integration-SB-03.env | 6 ++++++ deployment/heat/onap-oom/env/windriver/Integration-SB-04.env | 6 ++++++ deployment/heat/onap-oom/env/windriver/Integration-SB-05.env | 6 ++++++ deployment/heat/onap-oom/env/windriver/Integration-SB-06.env | 6 ++++++ deployment/heat/onap-oom/env/windriver/Integration-SB-07.env | 6 ++++++ 12 files changed, 64 insertions(+) diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env index fb9ad20bb..3532af4bb 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env @@ -37,5 +37,9 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env index fb9ad20bb..3532af4bb 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env @@ -37,5 +37,9 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env index fb9ad20bb..3532af4bb 100644 --- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env +++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env @@ -37,5 +37,9 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env index 20e78f5c0..ebbfe689e 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env @@ -37,5 +37,9 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env index 20e78f5c0..abe4661cd 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env @@ -37,5 +37,11 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true + log: + enabled: false diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env index 20e78f5c0..abe4661cd 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env @@ -37,5 +37,11 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true + log: + enabled: false diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env index 20e78f5c0..abe4661cd 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env @@ -37,5 +37,11 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true + log: + enabled: false diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env index 20e78f5c0..abe4661cd 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env @@ -37,5 +37,11 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true + log: + enabled: false diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env index 20e78f5c0..abe4661cd 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env @@ -37,5 +37,11 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true + log: + enabled: false diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env index 20e78f5c0..abe4661cd 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env @@ -37,5 +37,11 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true + log: + enabled: false diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env index 20e78f5c0..abe4661cd 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env @@ -37,5 +37,11 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true + log: + enabled: false diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env index 20e78f5c0..abe4661cd 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env @@ -37,5 +37,11 @@ parameters: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: replicaCount: 3 + config: + enableClustering: true sdnc: replicaCount: 3 + config: + enableClustering: true + log: + enabled: false -- cgit 1.2.3-korg From 6af0101d005fde5c1c01a5b3bd8fae3ec4f20a00 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Wed, 30 May 2018 22:19:08 -0400 Subject: Update DCAE Docker R2 image tags Issue-ID: DCAEGEN2-499 Change-Id: I06061a18286453ad6cd3b0af62a2f4dbccf8e558 Signed-off-by: Lusheng Ji (cherry picked from commit 6bdcf4db46fbc9e8b4fdec7641c5e2ce11e0989f) --- .../src/main/resources/docker-manifest.csv | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 377158ac5..b4eecb25f 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -45,20 +45,20 @@ onap/music/music,latest onap/oom/kube2msb,latest onap/optf-has,latest onap/optf-osdf,latest -onap/org.onap.dcaegen2.collectors.snmptrap,latest -onap/org.onap.dcaegen2.collectors.ves.vescollector,latest +onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0 +onap/org.onap.dcaegen2.collectors.ves.vescollector,1.2.0 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3 -onap/org.onap.dcaegen2.deployments.cm-container,latest -onap/org.onap.dcaegen2.deployments.healthcheck-container,latest -onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,latest -onap/org.onap.dcaegen2.deployments.redis-cluster-container,latest -onap/org.onap.dcaegen2.deployments.tca-cdap-container,latest -onap/org.onap.dcaegen2.platform.cdapbroker,v4.0.0 -onap/org.onap.dcaegen2.platform.configbinding,latest -onap/org.onap.dcaegen2.platform.deployment-handler,latest -onap/org.onap.dcaegen2.platform.inventory-api,latest -onap/org.onap.dcaegen2.platform.policy-handler,latest -onap/org.onap.dcaegen2.platform.servicechange-handler,latest +onap/org.onap.dcaegen2.deployments.cm-container,1.3.0 +onap/org.onap.dcaegen2.deployments.healthcheck-container,1.1.0 +onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.1.11 +onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0 +onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0 +onap/org.onap.dcaegen2.platform.cdapbroker,4.1.0 +onap/org.onap.dcaegen2.platform.configbinding,2.1.5 +onap/org.onap.dcaegen2.platform.deployment-handler,2.1.5 +onap/org.onap.dcaegen2.platform.inventory-api,3.0.1 +onap/org.onap.dcaegen2.platform.policy-handler,2.4.5 +onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4 onap/org.onap.dcaegen2.services.heartbeat,latest onap/org.onap.dcaegen2.services.prh.prh-app-server,latest onap/policy-drools,1.2.3 -- cgit 1.2.3-korg From e5d27485deb7f625f4c81fa55ef009f4d7e8d827 Mon Sep 17 00:00:00 2001 From: Chris Donley Date: Thu, 31 May 2018 13:01:28 -0700 Subject: Update vnfsdk components in docker manifest Issue-ID: VNFSDK-267 Change-Id: I01ee3732326f74c29cfbcfafdbdb6774e3f32ed0 Signed-off-by: Chris Donley --- version-manifest/src/main/resources/docker-manifest.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index b4eecb25f..b990b8e79 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -104,6 +104,8 @@ onap/vfc/ztesdncdriver,1.1.0-STAGING-latest onap/vfc/ztevmanagerdriver,1.0.3-STAGING-latest onap/vfc/ztevnfmdriver,1.1.0-STAGING-latest onap/vid,2.0.0 +onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.1.1 onap/vnfsdk/refrepo/postgres,1.1.1 +onap/vnfsdk/vnftest,1.1.0 openecomp/mso,1.2.1 -- cgit 1.2.3-korg From 589d4fb2f8f3c7bfcf47579a062663fcdd57507b Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Thu, 31 May 2018 18:24:49 -0400 Subject: Upversion manifests for new gizmo release Issue-ID: AAI-1189 Change-Id: Ic0b64c9a081ead0f30593029df4fdbc92d8442c5 Signed-off-by: Jimmy Forsyth --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- version-manifest/src/main/resources/java-manifest.csv | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index b990b8e79..88b372b2a 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -27,7 +27,7 @@ onap/data-router,1.2.2 onap/dmaap/buscontroller,latest onap/dmaap/dmaap-mr,1.1.4 onap/externalapi/nbi,latest -onap/gizmo,1.2.0 +onap/gizmo,1.2.1 onap/holmes/engine-management,latest onap/holmes/rule-management,latest onap/model-loader,1.2.1 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index f724def08..73ce444a0 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -45,6 +45,7 @@ org.onap.aai.event-client,event-client,1.2.2 org.onap.aai.event-client,event-client-api,1.2.2 org.onap.aai.event-client,event-client-dmaap,1.2.2 org.onap.aai.event-client,event-client-kafka,1.2.2 +org.onap.aai.gizmo,gizmo,1.2.1 org.onap.aai.logging-service,common-logging,1.2.2 org.onap.aai.logging-service,eelf-logging,1.2.2 org.onap.aai.logging-service,logging-api,1.2.2 -- cgit 1.2.3-korg From 894044d2865171b4c89af912412e851705b48abf Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 31 May 2018 15:11:13 -0700 Subject: Update testsuite docker image version Change-Id: I336232258b0caa07df78358e7e597cc4ef743266 Issue-ID: INT-500 Signed-off-by: Gary Wu (cherry picked from commit 2e3819dad7dacf32434c71c561dc79b6f086a2f5) --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 88b372b2a..169939a3e 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -82,7 +82,7 @@ onap/sdnc-ueb-listener-image,1.3-STAGING-latest onap/search-data-service,1.2.1 onap/sniroemulator,latest onap/sparky-be,1.2.1 -onap/testsuite,1.2.0 +onap/testsuite,1.2.1 onap/usecase-ui,latest onap/usecase-ui/usecase-ui-server,latest onap/vfc/catalog,1.1.0-STAGING-latest -- cgit 1.2.3-korg From 56bc0dd1790f10b42396f9b8c15f804071bd2ff5 Mon Sep 17 00:00:00 2001 From: hector Date: Fri, 1 Jun 2018 20:00:43 -0400 Subject: Enable kubectl auto-completion Issue-ID: INT-518 Change-Id: Ib7544018d73a1861a86b2ab07780b463f7ec704a Signed-off-by: Hector Anapan --- deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 78fe455a0..3f9150d1c 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -197,6 +197,8 @@ make all helm search -l | grep local helm install local/onap -n dev --namespace onap -f ~/integration-override.yaml +# Enable auto-completion for kubectl +echo "source <(kubectl completion bash)" >> ~/.bashrc # Check ONAP status: sleep 3 -- cgit 1.2.3-korg From 5447f044d3aec4462cdffa4b1868c3c63097994e Mon Sep 17 00:00:00 2001 From: Gildas Lanilis Date: Fri, 1 Jun 2018 22:18:46 -0700 Subject: Update Manifest for Holmes Update Docker and Java manifest to version 1.1.0 Change-Id: I410efeba141b66f47da603317fc7395f4cfa6a14 Issue-ID: HOLMES-132 Signed-off-by: Gildas Lanilis --- version-manifest/src/main/resources/docker-manifest.csv | 4 ++-- version-manifest/src/main/resources/java-manifest.csv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 169939a3e..2f9336577 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -28,8 +28,8 @@ onap/dmaap/buscontroller,latest onap/dmaap/dmaap-mr,1.1.4 onap/externalapi/nbi,latest onap/gizmo,1.2.1 -onap/holmes/engine-management,latest -onap/holmes/rule-management,latest +onap/holmes/engine-management,1.1.0 +onap/holmes/rule-management,1.1.0 onap/model-loader,1.2.1 onap/modeling/javatoscachecker,latest onap/msb/msb_apigateway,1.1.0-STAGING-latest diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 73ce444a0..5a377446e 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -123,8 +123,8 @@ org.onap.dmaap.messagerouter.mirroragent,dmaapMMAgent,1.0.0 org.onap.dmaap.messagerouter.msgrtr,msgrtr,1.0.0 org.onap.holmes.common,holmes-actions,1.0.0 org.onap.holmes.dsa,dmaap-dsa,1.0.0 -org.onap.holmes.engine-management,holmes-engine-d,1.0.0 -org.onap.holmes.rule-management,holmes-rulemgt,1.0.0 +org.onap.holmes.engine-management,holmes-engine-d,1.1.0 +org.onap.holmes.rule-management,holmes-rulemgt,1.1.0 org.onap.modeling.toscaparsers,Checker,1.0.0 org.onap.modeling.toscaparsers,Service,1.0.0 org.onap.modeling.toscaparsers,kwalify,1.0.0 -- cgit 1.2.3-korg From 38364c642c4a0ff07857128ddbb70010e4547935 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Mon, 4 Jun 2018 13:53:35 -0400 Subject: Update manifests for CCSDK, SDNC Update manifests to final version for CCSDK (0.2.4) and SDNC (1.3.4) Change-Id: If9e5a134ce6dbd7f1ce16560780b50dc0c5f504b Issue-ID: CCSDK-291 Signed-off-by: Timoney, Dan (dt5972) --- .../src/main/resources/docker-manifest.csv | 14 ++--- .../src/main/resources/java-manifest.csv | 62 +++++++++++----------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 2f9336577..ea7d2a071 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -17,9 +17,9 @@ onap/admportal-sdnc-image,1.3-STAGING-latest onap/appc-cdt-image,1.3.0-SNAPSHOT-latest onap/appc-image,1.3.0-SNAPSHOT-latest onap/babel,1.2.0 -onap/ccsdk-dgbuilder-image,0.2-STAGING-latest -onap/ccsdk-odl-image,0.2-STAGING-latest -onap/ccsdk-odlsli-image,0.2-STAGING-latest +onap/ccsdk-dgbuilder-image,0.2.4 +onap/ccsdk-odl-image,0.2.4 +onap/ccsdk-odlsli-image,0.2.4 onap/champ,1.2.3 onap/clamp,2.0-STAGING-latest onap/cli,2.0.2 @@ -75,10 +75,10 @@ onap/sdc-kibana,1.2-STAGING-latest onap/sdc-onboard-backend,1.2-STAGING-latest onap/sdc-sanity,1.2-STAGING-latest onap/sdc/sdc-workflow-designer,1.1.0-SNAPSHOT-STAGING-latest -onap/sdnc-ansible-server-image,1.3-STAGING-latest -onap/sdnc-dmaap-listener-image,1.3-STAGING-latest -onap/sdnc-image,1.3-STAGING-latest -onap/sdnc-ueb-listener-image,1.3-STAGING-latest +onap/sdnc-ansible-server-image,1.3.4 +onap/sdnc-dmaap-listener-image,1.3.4 +onap/sdnc-image,1.3.4 +onap/sdnc-ueb-listener-image,1.3.4 onap/search-data-service,1.2.1 onap/sniroemulator,latest onap/sparky-be,1.2.1 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 5a377446e..a1e1f6abc 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -58,34 +58,34 @@ org.onap.aai.sparky-be,sparky-be,1.2.0 org.onap.aai.sparky-fe,sparky-fe,1.2.1 org.onap.aai.traversal,aai-traversal,1.2.0 org.onap.aai.traversal,traversal,1.2.0 -org.onap.ccsdk.parent,binding-parent,1.0.1 -org.onap.ccsdk.parent,bundle-parent,1.0.1 -org.onap.ccsdk.parent,feature-repo-parent,1.0.1 -org.onap.ccsdk.parent,karaf4-parent,1.0.1 -org.onap.ccsdk.parent,mdsal-it-parent,1.0.1 -org.onap.ccsdk.parent,odlparent,1.0.1 -org.onap.ccsdk.parent,odlparent-lite,1.0.1 -org.onap.ccsdk.parent,single-feature-parent,1.0.1 -org.onap.ccsdk.sli.adaptors,aai-service-provider,0.2.1 -org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.2.1 -org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.2.1 -org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.2.1 -org.onap.ccsdk.sli.core,dblib-provider,0.2.1 -org.onap.ccsdk.sli.core,filters-provider,0.2.1 -org.onap.ccsdk.sli.core,sli-common,0.2.1 -org.onap.ccsdk.sli.core,sli-provider,0.2.1 -org.onap.ccsdk.sli.core,sli-recording,0.2.1 -org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.2.1 -org.onap.ccsdk.sli.core,sliapi-provider,0.2.1 -org.onap.ccsdk.sli.core,utils-provider,0.2.1 -org.onap.ccsdk.sli.northbound,asdcApi-provider,0.2.1 -org.onap.ccsdk.sli.northbound,dataChange-provider,0.2.1 -org.onap.ccsdk.sli.northbound,dmaap-listener,0.2.1 -org.onap.ccsdk.sli.northbound,lcm-provider,0.2.1 -org.onap.ccsdk.sli.northbound,ueb-listener,0.2.1 -org.onap.ccsdk.sli.plugins,fabric-discovery-plugin-provider,0.2.1 -org.onap.ccsdk.sli.plugins,properties-node-provider,0.2.1 -org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.2.1 +org.onap.ccsdk.parent,binding-parent,1.0.4 +org.onap.ccsdk.parent,bundle-parent,1.0.4 +org.onap.ccsdk.parent,feature-repo-parent,1.0.4 +org.onap.ccsdk.parent,karaf4-parent,1.0.4 +org.onap.ccsdk.parent,mdsal-it-parent,1.0.4 +org.onap.ccsdk.parent,odlparent,1.0.4 +org.onap.ccsdk.parent,odlparent-lite,1.0.4 +org.onap.ccsdk.parent,single-feature-parent,1.0.4 +org.onap.ccsdk.sli.adaptors,aai-service-provider,0.2.4 +org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.2.4 +org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.2.4 +org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.2.4 +org.onap.ccsdk.sli.core,dblib-provider,0.2.4 +org.onap.ccsdk.sli.core,filters-provider,0.2.4 +org.onap.ccsdk.sli.core,sli-common,0.2.4 +org.onap.ccsdk.sli.core,sli-provider,0.2.4 +org.onap.ccsdk.sli.core,sli-recording,0.2.4 +org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.2.4 +org.onap.ccsdk.sli.core,sliapi-provider,0.2.4 +org.onap.ccsdk.sli.core,utils-provider,0.2.4 +org.onap.ccsdk.sli.northbound,asdcApi-provider,0.2.4 +org.onap.ccsdk.sli.northbound,dataChange-provider,0.2.4 +org.onap.ccsdk.sli.northbound,dmaap-listener,0.2.4 +org.onap.ccsdk.sli.northbound,lcm-provider,0.2.4 +org.onap.ccsdk.sli.northbound,ueb-listener,0.2.4 +org.onap.ccsdk.sli.plugins,fabric-discovery-plugin-provider,0.2.4 +org.onap.ccsdk.sli.plugins,properties-node-provider,0.2.4 +org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.2.4 org.onap.ccsdk.storage.pgaas,pgaas,1.0.0 org.onap.ccsdk.utils,utils,1.0.0 org.onap.clamp.clds.clamp,clamp,2.0.0 @@ -149,9 +149,9 @@ org.onap.portal.sdk,epsdk-core,2.2.0 org.onap.portal.sdk,epsdk-fw,2.2.0 org.onap.portal.sdk,epsdk-workflow,2.2.0 org.onap.sdc.sdc-workflow-designer,sdc-workflow-designer,1.0.0 -org.onap.sdnc.northbound,generic-resource-api.provider,1.3.1 -org.onap.sdnc.northbound,vnfapi-provider,1.3.1 -org.onap.sdnc.northbound,vnftools-provider,1.3.1 +org.onap.sdnc.northbound,generic-resource-api.provider,1.3.4 +org.onap.sdnc.northbound,vnfapi-provider,1.3.4 +org.onap.sdnc.northbound,vnftools-provider,1.3.4 org.onap.usecase-ui,usecaseui-common,1.0.1 org.onap.usecase-ui.server,usecase-ui-server,1.0.1 org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.0.1 -- cgit 1.2.3-korg From ef3bbee746e6901f136badd8a8c012129ba3cc75 Mon Sep 17 00:00:00 2001 From: Eric Debeau Date: Mon, 4 Jun 2018 21:21:49 +0000 Subject: Update manifest file Update exernalapi/nbi to 2.0.0 Change-Id: I27e37448d0a5194b379b2696578f12168a4384ca Issue-ID: EXTAPI-103 Signed-off-by: Eric Debeau --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index ea7d2a071..f98d760ed 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -26,7 +26,7 @@ onap/cli,2.0.2 onap/data-router,1.2.2 onap/dmaap/buscontroller,latest onap/dmaap/dmaap-mr,1.1.4 -onap/externalapi/nbi,latest +onap/externalapi/nbi,2.0.0 onap/gizmo,1.2.1 onap/holmes/engine-management,1.1.0 onap/holmes/rule-management,1.1.0 -- cgit 1.2.3-korg From 548b209bdc559046511ceb7753aa4f26fc03f852 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 4 Jun 2018 13:10:01 -0700 Subject: Update appc versions Update java and docker versions. Change appc to org.onap naming. Change-Id: I49c914b1db0da67bbdb9ef2dd8437da8aa1af00a Signed-off-by: Patrick Brady Issue-ID: APPC-967 (cherry picked from commit 295cb5e6d757f13f584b041b696884402187f8ec) --- .../src/main/resources/docker-manifest.csv | 4 +- .../src/main/resources/java-manifest.csv | 124 +++++++++++---------- 2 files changed, 65 insertions(+), 63 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index f98d760ed..697a89772 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -14,8 +14,8 @@ onap/aai-traversal,1.2.1 onap/aai/esr-gui,latest onap/aai/esr-server,latest onap/admportal-sdnc-image,1.3-STAGING-latest -onap/appc-cdt-image,1.3.0-SNAPSHOT-latest -onap/appc-image,1.3.0-SNAPSHOT-latest +onap/appc-cdt-image,1.3.0 +onap/appc-image,1.3.0 onap/babel,1.2.0 onap/ccsdk-dgbuilder-image,0.2.4 onap/ccsdk-odl-image,0.2.4 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index a1e1f6abc..b88db4524 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -58,6 +58,69 @@ org.onap.aai.sparky-be,sparky-be,1.2.0 org.onap.aai.sparky-fe,sparky-fe,1.2.1 org.onap.aai.traversal,aai-traversal,1.2.0 org.onap.aai.traversal,traversal,1.2.0 +org.onap.appc,appc-aai-client-provider,1.3.0 +org.onap.appc,appc-ansible-adapter-bundle,1.3.0 +org.onap.appc,appc-artifact-handler-provider,1.3.0 +org.onap.appc,appc-chef-adapter-bundle,1.3.0 +org.onap.appc,appc-command-executor-api,1.3.0 +org.onap.appc,appc-command-executor-core,1.3.0 +org.onap.appc,appc-common,1.3.0 +org.onap.appc,appc-config-adaptor-provider,1.3.0 +org.onap.appc,appc-config-audit-provider,1.3.0 +org.onap.appc,appc-config-data-services-provider,1.3.0 +org.onap.appc,appc-config-encryption-tool-provider,1.3.0 +org.onap.appc,appc-config-flow-controller-provider,1.3.0 +org.onap.appc,appc-config-generator-provider,1.3.0 +org.onap.appc,appc-config-params-provider,1.3.0 +org.onap.appc,appc-data-access-lib,1.3.0 +org.onap.appc,appc-design-services-provider,1.3.0 +org.onap.appc,appc-dg-aai,1.3.0 +org.onap.appc,appc-dg-common,1.3.0 +org.onap.appc,appc-dg-license-manager,1.3.0 +org.onap.appc,appc-dg-mdsal-store,1.3.0 +org.onap.appc,appc-dg-netconf,1.3.0 +org.onap.appc,appc-dg-provider,1.3.0 +org.onap.appc,appc-dg-ssh,1.3.0 +org.onap.appc,appc-dg-util-bundle,1.3.0 +org.onap.appc,appc-dmaap-adapter-bundle,1.3.0 +org.onap.appc,appc-event-listener-bundle,1.3.0 +org.onap.appc,appc-iaas-adapter-bundle,1.3.0 +org.onap.appc,appc-license-manager-api,1.3.0 +org.onap.appc,appc-license-manager-core,1.3.0 +org.onap.appc,appc-lifecycle-management-api,1.3.0 +org.onap.appc,appc-lifecycle-management-core,1.3.0 +org.onap.appc,appc-message-adapter-api,1.3.0 +org.onap.appc,appc-message-adapter-factory,1.3.0 +org.onap.appc,appc-metric-bundle,1.3.0 +org.onap.appc,appc-netconf-adapter-bundle,1.3.0 +org.onap.appc,appc-network-inventory-client-provider,1.3.0 +org.onap.appc,appc-oam-bundle,1.3.0 +org.onap.appc,appc-provider-bundle,1.3.0 +org.onap.appc,appc-ranking-framework-lib,1.3.0 +org.onap.appc,appc-request-handler-api,1.3.0 +org.onap.appc,appc-request-handler-core,1.3.0 +org.onap.appc,appc-rest-adapter-bundle,1.3.0 +org.onap.appc,appc-rest-healthcheck-adapter-bundle,1.3.0 +org.onap.appc,appc-sdc-listener-bundle,1.3.0 +org.onap.appc,appc-sequence-generator-bundle,1.3.0 +org.onap.appc,appc-ssh-adapter-api,1.3.0 +org.onap.appc,appc-ssh-adapter-sshd,1.3.0 +org.onap.appc,appc-ssh-adapter-tests,1.3.0 +org.onap.appc,appc-workflow-management-api,1.3.0 +org.onap.appc,appc-workflow-management-core,1.3.0 +org.onap.appc,appc-yang-generator,1.3.0 +org.onap.appc,execution-queue-management-lib,1.3.0 +org.onap.appc,lock-manager-api,1.3.0 +org.onap.appc,lock-manager-impl,1.3.0 +org.onap.appc,state-machine-lib,1.3.0 +org.onap.appc,transaction-recorder,1.3.0 +org.onap.appc.cdt,cdt-proxy-service,1.3.0 +org.onap.appc.cdt,config-design-tool,1.3.0 +org.onap.appc.client,client-kit,1.3.0 +org.onap.appc.client,client-lib,1.3.0 +org.onap.appc.client,client-simulator,1.3.0 +org.onap.appc.client,code-generator,1.3.0 +org.onap.appc.plugins,dg-loader-provider,1.3.0 org.onap.ccsdk.parent,binding-parent,1.0.4 org.onap.ccsdk.parent,bundle-parent,1.0.4 org.onap.ccsdk.parent,feature-repo-parent,1.0.4 @@ -177,67 +240,6 @@ org.onap.vnfsdk.validation,csarvalidation-deployment,1.1.1 org.onap.vnfsdk.validation,validation,1.1.2 org.onap.vnfsdk.validation,validation-csar,1.1.2 org.onap.vnfsdk.ves-agent,evel_javalib2,1.1.0 -org.openecomp.appc,appc-aai-client-provider,1.2.0 -org.openecomp.appc,appc-ansible-adapter-bundle,1.2.0 -org.openecomp.appc,appc-artifact-handler-provider,1.2.0 -org.openecomp.appc,appc-chef-adapter-bundle,1.2.0 -org.openecomp.appc,appc-command-executor-api,1.2.0 -org.openecomp.appc,appc-command-executor-core,1.2.0 -org.openecomp.appc,appc-common,1.2.0 -org.openecomp.appc,appc-config-adaptor-provider,1.2.0 -org.openecomp.appc,appc-config-audit-provider,1.2.0 -org.openecomp.appc,appc-config-data-services-provider,1.2.0 -org.openecomp.appc,appc-config-encryption-tool-provider,1.2.0 -org.openecomp.appc,appc-config-flow-controller-provider,1.2.0 -org.openecomp.appc,appc-config-generator-provider,1.2.0 -org.openecomp.appc,appc-config-params-provider,1.2.0 -org.openecomp.appc,appc-data-access-lib,1.2.0 -org.openecomp.appc,appc-design-services-provider,1.2.0 -org.openecomp.appc,appc-dg-aai,1.2.0 -org.openecomp.appc,appc-dg-common,1.2.0 -org.openecomp.appc,appc-dg-license-manager,1.2.0 -org.openecomp.appc,appc-dg-mdsal-store,1.2.0 -org.openecomp.appc,appc-dg-netconf,1.2.0 -org.openecomp.appc,appc-dg-provider,1.2.0 -org.openecomp.appc,appc-dg-ssh,1.2.0 -org.openecomp.appc,appc-dg-util-bundle,1.2.0 -org.openecomp.appc,appc-dmaap-adapter-bundle,1.2.0 -org.openecomp.appc,appc-event-listener-bundle,1.2.0 -org.openecomp.appc,appc-iaas-adapter-bundle,1.2.0 -org.openecomp.appc,appc-license-manager-api,1.2.0 -org.openecomp.appc,appc-license-manager-core,1.2.0 -org.openecomp.appc,appc-lifecycle-management-api,1.2.0 -org.openecomp.appc,appc-lifecycle-management-core,1.2.0 -org.openecomp.appc,appc-message-adapter-api,1.2.0 -org.openecomp.appc,appc-message-adapter-factory,1.2.0 -org.openecomp.appc,appc-metric-bundle,1.2.0 -org.openecomp.appc,appc-netconf-adapter-bundle,1.2.0 -org.openecomp.appc,appc-network-inventory-client-provider,1.2.0 -org.openecomp.appc,appc-oam-bundle,1.2.0 -org.openecomp.appc,appc-provider-bundle,1.2.0 -org.openecomp.appc,appc-ranking-framework-lib,1.2.0 -org.openecomp.appc,appc-request-handler-api,1.2.0 -org.openecomp.appc,appc-request-handler-core,1.2.0 -org.openecomp.appc,appc-rest-adapter-bundle,1.2.0 -org.openecomp.appc,appc-rest-healthcheck-adapter-bundle,1.2.0 -org.openecomp.appc,appc-sdc-listener-bundle,1.2.0 -org.openecomp.appc,appc-sequence-generator-bundle,1.2.0 -org.openecomp.appc,appc-ssh-adapter-api,1.2.0 -org.openecomp.appc,appc-ssh-adapter-sshd,1.2.0 -org.openecomp.appc,appc-ssh-adapter-tests,1.2.0 -org.openecomp.appc,appc-workflow-management-api,1.2.0 -org.openecomp.appc,appc-workflow-management-core,1.2.0 -org.openecomp.appc,appc-yang-generator,1.2.0 -org.openecomp.appc,execution-queue-management-lib,1.2.0 -org.openecomp.appc,lock-manager-api,1.2.0 -org.openecomp.appc,lock-manager-impl,1.2.0 -org.openecomp.appc,state-machine-lib,1.2.0 -org.openecomp.appc,transaction-recorder,1.2.0 -org.openecomp.appc.client,client-kit,1.2.0 -org.openecomp.appc.client,client-lib,1.2.0 -org.openecomp.appc.client,client-simulator,1.2.0 -org.openecomp.appc.client,code-generator,1.2.0 -org.openecomp.appc.plugins,dg-loader-provider,1.2.0 org.openecomp.sdc.jtosca,jtosca,1.1.1 org.openecomp.sdc.sdc-distribution-client,sdc-main-distribution-client,1.1.32 org.openecomp.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.0.0 -- cgit 1.2.3-korg From e9ed47c849c1472bdf3c648c9ea582c6e03ca255 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 4 Jun 2018 16:12:38 -0700 Subject: Add initial README for deployment directory Change-Id: I28d7edeb11fa191cd9da8e2cfa3c46805a0e7894 Issue-ID: INT-506 Signed-off-by: Gary Wu --- deployment/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 deployment/README.md diff --git a/deployment/README.md b/deployment/README.md new file mode 100644 index 000000000..e1b8b8748 --- /dev/null +++ b/deployment/README.md @@ -0,0 +1,8 @@ + +# ONAP Integration - Deployment + +## Description + +* Heat templates and scripts for automatic deployments for system testing and continuous integration test flows +* Sample OPENRC and heat environment settings files for ONAP deployment in ONAP External Labs + -- cgit 1.2.3-korg From a3fb86f6caa0d6c12daa99ffa59a3fd805bb0886 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 4 Jun 2018 16:23:54 -0700 Subject: Add license header to deployment scripts Change-Id: I5c14c553a5d702b625f69d361cbb2d22cb52cd5a Issue-ID: INT-504 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/k8s_vm_entrypoint.sh | 10 ++++++++++ deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 10 ++++++++++ deployment/heat/onap-oom/scripts/deploy.sh | 9 +++++++++ deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 9 +++++++++ deployment/heat/onap-oom/scripts/prepull-docker.sh | 9 +++++++++ 5 files changed, 47 insertions(+) diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh index 1ec659c0e..a6392354c 100644 --- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh @@ -1,4 +1,14 @@ #!/bin/bash -x +# +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# + printenv mkdir -p /opt/config diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 3f9150d1c..e44e20ccd 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -1,4 +1,14 @@ #!/bin/bash -x +# +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# + printenv mkdir -p /opt/config diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index aaf5924e7..e3acd3c95 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -1,4 +1,13 @@ #!/bin/bash -x +# +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index 41d511391..1ab0de762 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -1,4 +1,13 @@ #!/bin/bash +# +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# if [ "$#" -ne 1 ]; then echo This script generates the HEAT template for X number of k8s VMs diff --git a/deployment/heat/onap-oom/scripts/prepull-docker.sh b/deployment/heat/onap-oom/scripts/prepull-docker.sh index d3556a882..4f88bcbec 100755 --- a/deployment/heat/onap-oom/scripts/prepull-docker.sh +++ b/deployment/heat/onap-oom/scripts/prepull-docker.sh @@ -1,4 +1,13 @@ #!/bin/bash -x +# +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` -- cgit 1.2.3-korg From 61f8eb477e7f8c9859dbeb0cbeebf49f0f1cd7df Mon Sep 17 00:00:00 2001 From: Huabing Zhao Date: Tue, 5 Jun 2018 15:22:54 +0800 Subject: Update manifest Issue-ID: MSB-200 Change-Id: Id1617c796bb17a7aba6b4c29b0b5966bac4c3dc1 Signed-off-by: Huabing Zhao --- version-manifest/src/main/resources/docker-manifest.csv | 4 ++-- version-manifest/src/main/resources/java-manifest.csv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 697a89772..b924cae98 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -32,8 +32,8 @@ onap/holmes/engine-management,1.1.0 onap/holmes/rule-management,1.1.0 onap/model-loader,1.2.1 onap/modeling/javatoscachecker,latest -onap/msb/msb_apigateway,1.1.0-STAGING-latest -onap/msb/msb_discovery,1.1.0-STAGING-latest +onap/msb/msb_apigateway,1.1.0 +onap/msb/msb_discovery,1.1.0 onap/multicloud/framework,1.1.2-STAGING onap/multicloud/openstack-newton,1.1.2-SNAPSHOT onap/multicloud/openstack-ocata,1.1.2-SNAPSHOT diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index b88db4524..075825131 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -192,8 +192,8 @@ org.onap.modeling.toscaparsers,Checker,1.0.0 org.onap.modeling.toscaparsers,Service,1.0.0 org.onap.modeling.toscaparsers,kwalify,1.0.0 org.onap.modeling.toscaparsers.nfvparser,modeling-toscaparsers-nfvparser,1.0.0 -org.onap.msb.java-sdk,msb-java-sdk,1.0.0 -org.onap.msb.swagger-sdk,swagger-sdk,1.0.0 +org.onap.msb.java-sdk,msb-java-sdk,1.1.1 +org.onap.msb.swagger-sdk,swagger-sdk,1.1.0 org.onap.multicloud.framework,multivimbroker,1.0.0 org.onap.multicloud.openstack,newton,1.0.0 org.onap.multicloud.openstack,ocata,1.0.0 -- cgit 1.2.3-korg From ba804644c5e3987591aff25c1614c026b949d7e7 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Tue, 5 Jun 2018 09:57:22 +0200 Subject: Update CLAMP Update CLAMP to 2.0.2 to align on the release Change-Id: Ifd9f1863e8b0ef1141ff54a1b956831876bc7ea2 Issue-ID: CLAMP-176 Signed-off-by: Determe, Sebastien (sd378r) --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- version-manifest/src/main/resources/java-manifest.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 2f9336577..ae4a8c135 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -21,7 +21,7 @@ onap/ccsdk-dgbuilder-image,0.2-STAGING-latest onap/ccsdk-odl-image,0.2-STAGING-latest onap/ccsdk-odlsli-image,0.2-STAGING-latest onap/champ,1.2.3 -onap/clamp,2.0-STAGING-latest +onap/clamp,2.0.2 onap/cli,2.0.2 onap/data-router,1.2.2 onap/dmaap/buscontroller,latest diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 5a377446e..37c1c512a 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -88,7 +88,7 @@ org.onap.ccsdk.sli.plugins,properties-node-provider,0.2.1 org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.2.1 org.onap.ccsdk.storage.pgaas,pgaas,1.0.0 org.onap.ccsdk.utils,utils,1.0.0 -org.onap.clamp.clds.clamp,clamp,2.0.0 +org.onap.clamp.clds.clamp,clamp,2.0.2 org.onap.cli,cli-framework,2.0.2 org.onap.cli,cli-main,2.0.2 org.onap.cli,cli-plugins-sample,2.0.2 -- cgit 1.2.3-korg From 345d575690d912757349c96fd2406c5da2557e93 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Tue, 5 Jun 2018 11:27:23 +0300 Subject: update sdc artifacts update docker versions and artifact versions for master Change-Id: I1f954dc35706a11f7b9a1dd054a98fb53d82ec15 Issue-ID: SDC-1397 Signed-off-by: Michael Lando --- .gitreview | 4 ++++ .../src/main/resources/docker-manifest.csv | 22 ++++++++++++++-------- .../src/main/resources/java-manifest.csv | 8 ++++---- 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 000000000..6e77300ea --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.onap.org +port=29418 +project=integration.git diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 697a89772..1482846fd 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -67,14 +67,20 @@ onap/portal-app,v2.2.0 onap/portal-db,v2.2.0 onap/portal-sdk,v2.2.0 onap/portal-wms,v2.2.0 -onap/sdc-backend,1.2-STAGING-latest -onap/sdc-cassandra,1.2-STAGING-latest -onap/sdc-elasticsearch,1.2-STAGING-latest -onap/sdc-frontend,1.2-STAGING-latest -onap/sdc-kibana,1.2-STAGING-latest -onap/sdc-onboard-backend,1.2-STAGING-latest -onap/sdc-sanity,1.2-STAGING-latest -onap/sdc/sdc-workflow-designer,1.1.0-SNAPSHOT-STAGING-latest +onap/sdc-api-tests,1.3-STAGING-latest +onap/sdc-backend,1.3-STAGING-latest +onap/sdc-backend-init,1.3-STAGING-latest +onap/sdc-cassandra,1.3-STAGING-latest +onap/sdc-cassandra-init,1.3-STAGING-latest +onap/sdc-elasticsearch,1.3-STAGING-latest +onap/sdc-frontend,1.3-STAGING-latest +onap/sdc-init-elasticsearch,1.3-STAGING-latest +onap/sdc-kibana,1.3-STAGING-latest +onap/sdc-onboard-backend,1.3-STAGING-latest +onap/sdc-onboard-cassandra-init,1.3-STAGING-latest +onap/sdc-simulator,1.3-STAGING-latest +onap/sdc-ui-tests,1.3-STAGING-latest +onap/sdc/sdc-workflow-designer,1.1.0 onap/sdnc-ansible-server-image,1.3.4 onap/sdnc-dmaap-listener-image,1.3.4 onap/sdnc-image,1.3.4 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index b88db4524..b3195b02a 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -211,6 +211,10 @@ org.onap.portal.sdk,epsdk-app-overlay,2.2.0 org.onap.portal.sdk,epsdk-core,2.2.0 org.onap.portal.sdk,epsdk-fw,2.2.0 org.onap.portal.sdk,epsdk-workflow,2.2.0 +org.onap.sdc.jtosca,jtosca,1.3.5 +org.onap.sdc.sdc-distribution-client,sdc-distribution-client,1.3.0 +org.onap.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.2.0 +org.onap.sdc.sdc-tosca,sdc-tosca,1.3.5 org.onap.sdc.sdc-workflow-designer,sdc-workflow-designer,1.0.0 org.onap.sdnc.northbound,generic-resource-api.provider,1.3.4 org.onap.sdnc.northbound,vnfapi-provider,1.3.4 @@ -240,10 +244,6 @@ org.onap.vnfsdk.validation,csarvalidation-deployment,1.1.1 org.onap.vnfsdk.validation,validation,1.1.2 org.onap.vnfsdk.validation,validation-csar,1.1.2 org.onap.vnfsdk.ves-agent,evel_javalib2,1.1.0 -org.openecomp.sdc.jtosca,jtosca,1.1.1 -org.openecomp.sdc.sdc-distribution-client,sdc-main-distribution-client,1.1.32 -org.openecomp.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.0.0 -org.openecomp.sdc.sdc-tosca,sdc-tosca,1.1.32 org.openecomp.so,MSOCommonBPMN,1.1.1 org.openecomp.so,MSOCoreBPMN,1.1.1 org.openecomp.so,MSOInfrastructureBPMN,1.1.1 -- cgit 1.2.3-korg From 4a6ece4ba912ccf3401739843e3dfe3478a0e4d5 Mon Sep 17 00:00:00 2001 From: Mariusz Wagner Date: Tue, 5 Jun 2018 15:54:27 +0200 Subject: Added 4 new TC Issue-ID: INT-510 Change-Id: Iabc9b4d563fd981d60536e45b62a2286f17cd904 Signed-off-by: Mariusz Wagner --- test/csit/plans/dcaegen2/prh_testsuites/setup.sh | 17 +- .../csit/plans/dcaegen2/prh_testsuites/teardown.sh | 3 +- .../assets/json_events/pnf_ready.json | 6 - .../prh_testcases/assets/json_events/response.json | 33 - test/csit/tests/dcaegen2/prh_testcases/prh.robot | 19 - .../tests/dcaegen2/prh_testcases/prh_tests.robot | 91 +- .../resources/CommonEventFormat_28.3.json | 1866 -------------------- .../dcaegen2/prh_testcases/resources/DMaaP.py | 157 -- .../dcaegen2/prh_testcases/resources/Dockerfile | 13 - .../dcaegen2/prh_testcases/resources/PrhLibrary.py | 95 - .../prh_testcases/resources/PrhVariables.py | 18 - .../dcaegen2/prh_testcases/resources/Simulator.py | 91 - .../prh_testcases/resources/docker-compose.yml | 23 +- .../resources/events/pnf_register_event.json | 1 - .../prh_testcases/resources/prh_keywords.robot | 61 - .../prh_testcases/resources/simulator/AAI.py | 56 + .../resources/simulator/AAI_simulator | 11 + .../prh_testcases/resources/simulator/DMaaP.py | 75 + .../resources/simulator/DMaaP_simulator | 11 + 19 files changed, 239 insertions(+), 2408 deletions(-) delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/prh.robot delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/CommonEventFormat_28.3.json delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/DMaaP.py delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/Dockerfile delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json delete mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI.py create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI_simulator create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP.py create mode 100644 test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP_simulator diff --git a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh index 012d4c5d9..279696597 100644 --- a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh +++ b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh @@ -4,18 +4,20 @@ source ${SCRIPTS}/common_functions.sh export PRH_SERVICE="prh" export DMAAP_SIMULATOR="dmaap_simulator" +export AAI_SIMULATOR="aai_simulator" cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/resources/ docker login -u docker -p docker nexus3.onap.org:10003 -docker-compose up -d +docker-compose up -d --build # Wait for initialization of Docker containers for i in {1..50}; do if [ $(docker inspect --format '{{ .State.Running }}' ${PRH_SERVICE}) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ] + [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' ${AAI_SIMULATOR}) ] then - echo "dmaap_simulator and prh services are running" + echo "dmaap_simulator, aai_simulator and prh services are running" break else echo sleep ${i} @@ -25,26 +27,29 @@ done PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${PRH_SERVICE}) DMAAP_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${DMAAP_SIMULATOR}) +AAI_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${AAI_SIMULATOR}) bypass_ip_adress ${PRH_IP} bypass_ip_adress ${DMAAP_SIMULATOR_IP} +bypass_ip_adress ${AAI_SIMULATOR_IP} echo PRH_IP=${PRH_IP} echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP} +echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP} # Wait for initialization of docker services for i in {1..50}; do curl -sS -m 1 localhost:2222 && \ + curl -sS -m 1 localhost:3333 && \ curl -sS -m 1 localhost:8100/heartbeat && break echo sleep ${i} sleep ${i} done -# docker cp prh:/config/prh_endpoints.json ${WORKDIR} sed -i -e 's/"dmaapHostName":.*/"dmaapHostName": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json -sed -i -e 's/"aaiHost":.*/"aaiHost": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json +sed -i -e 's/"aaiHost":.*/"aaiHost": "'${AAI_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json docker cp ${WORKDIR}/prh_endpoints.json prh:/config/ #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v PRH:localhost:8100" +ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v AAI_SIMULATOR:localhost:3333 -v PRH:localhost:8100" diff --git a/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh b/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh index 5ff3c6689..bd1e5ba06 100644 --- a/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh +++ b/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh @@ -16,4 +16,5 @@ # kill-instance.sh prh -kill-instance.sh dmaap_simulator \ No newline at end of file +kill-instance.sh dmaap_simulator +kill-instance.sh aai_simulator diff --git a/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json deleted file mode 100644 index d340709c9..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json +++ /dev/null @@ -1,6 +0,0 @@ -{"event": - {"correlationID":"NOKQTFCOC540002E", - "pnfOamIpv4Address":"10.16.123.234", - "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334" - } -} diff --git a/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json deleted file mode 100644 index 39c76df95..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json +++ /dev/null @@ -1,33 +0,0 @@ -{"event": - {"commonEventHeader": - {"sourceId":"QTFCOC540002E", - "startEpochMicrosec":1519837825682, - "eventId":"QTFCOC540002E-reg", - "nfcNamingCode":"5DU", - "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, - "eventType":"pnfRegistration", - "priority":"Normal", - "version":3, - "reportingEntityName":"5GRAN_DU", - "sequence":0, - "domain":"other", - "lastEpochMicrosec":1519837825682, - "eventName":"pnfRegistration_5GDU", - "sourceName":"5GRAN_DU", - "nfNamingCode":"5GRAN" - }, - "otherFields": - {"pnfLastServiceDate":1517206400, - "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", - "pnfVendorName":"Nokia", - "pnfModelNumber":"AJ02", - "pnfFamily":"BBU", - "pnfType":"AirScale", - "otherFieldsVersion":1, - "pnfOamIpv4Address":"10.16.123.234", - "pnfSoftwareVersion":"v4.5.0.1", - "pnfSerialNumber":"QTFCOC540002E", - "pnfManufactureDate":1516406400 - } - } -} diff --git a/test/csit/tests/dcaegen2/prh_testcases/prh.robot b/test/csit/tests/dcaegen2/prh_testcases/prh.robot deleted file mode 100644 index 7c9b9533f..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/prh.robot +++ /dev/null @@ -1,19 +0,0 @@ -*** Settings *** -Documentation Testing PRH with various use scenarios -Suite Setup PRH Suite Setup -Suite Teardown PRH Suite Shutdown -Library Collections -Library resources/PrhLibrary.py -Resource resources/prh_keywords.robot - -*** Variables *** -${DMaaP_URL} http://localhost:3904 -${AAI_URL} http://localhost:3905 -${PNF_READY} %{WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json - -*** Test Cases *** -New test - [Documentation] First positive TC - [Tags] PRH - #First TC will be added after initial commit - Should Be True True diff --git a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot b/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot index ec21b39fb..764a879a3 100644 --- a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot +++ b/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot @@ -1,48 +1,65 @@ *** Settings *** -Library OperatingSystem Library RequestsLibrary -Library requests -Library Collections -Library String *** Variables *** -${PNF_REGISTER_URL} http://${DMAAP_SIMULATOR}/events/unauthenticated.SEC_OTHER_OUTPUT -${PNF_READY_URL} http://${DMAAP_SIMULATOR}/events/pnfReady -${PRH_START_URL} http://${PRH}/start -${PNF_REGISTER_EVENT} %{WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json - +${DMAAP_SIM_URL} http://${DMAAP_SIMULATOR} +${AAI_SIM_URL} http://${AAI_SIMULATOR} +${PRH_URL} http://${PRH} *** Test Cases *** -Run Posting and Consuming - [Documentation] Post message to new topic and consume it - [Timeout] 1 minute - ${req_data}= Get Binary File ${PNF_REGISTER_EVENT} - ${resp}= PostCall ${PNF_REGISTER_URL} ${req_data} - log ${PNF_REGISTER_URL} - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 200 - # ${count}= Evaluate $resp.json().get('count') - log 'JSON Response Code:' ${resp} - ${resp}= GetCall ${PRH_START_URL} - log ${PRH_START_URL} - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 201 - ${resp}= GetCall ${PNF_READY_URL} - log ${PNF_READY_URL} - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 200 - log 'JSON Response Code:' ${resp} - +Getting and Consuming Positive Scenario + [Documentation] Get message from new topic and consume it - positive scenarios + [Tags] PRH + [Setup] Start prh + [Template] Run Getting and Consuming + [Timeout] + {"pnfName":"NOKQTFCOC540002E","ipv4":"10.16.123.234","ipv6":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"} NOKQTFCOC540002E {"event": {"commonEventHeader": {"sourceId":"QTFCOC540002E", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC540002E-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", "pnfVendorName":"Nokia", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"10.16.123.234", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC540002E", "pnfManufactureDate":1516406400}}} + {"pnfName":"NOKQTFCOC540002F","ipv4":"","ipv6":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"} NOKQTFCOC540002F {"event": {"commonEventHeader": {"sourceId":"QTFCOC540002F", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC540002F-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", "pnfVendorName":"Nokia", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC540002F", "pnfManufactureDate":1516406400}}} + {"pnfName":"NOKQTFCOC540002G","ipv4":"10.16.123.234","ipv6":""} NOKQTFCOC540002G {"event": {"commonEventHeader": {"sourceId":"QTFCOC540002G", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC540002G-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"", "pnfVendorName":"Nokia", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"10.16.123.234", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC540002G", "pnfManufactureDate":1516406400}}} + {"pnfName":"ERIQTFCOC5400000","ipv4":"10.16.123.23","ipv6":""} ERIQTFCOC5400000 {"event": {"commonEventHeader": {"sourceId":"QTFCOC5400000", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC5400000-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"", "pnfVendorName":"Ericsson", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"10.16.123.23", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC5400000", "pnfManufactureDate":1516406400}}} + [Teardown] Stop prh *** Keywords *** -PostCall - [Arguments] ${url} ${data} +Run Getting and Consuming + [Arguments] ${posted_event_to_dmaap} ${pnfs_name} ${event_in_dmaap} + [Timeout] 1 minutes + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json + Set pnfs name in AAI ${pnfs_name} + Set get event in DMAAP ${event_in_dmaap} ${headers} + : FOR ${Index} IN RANGE 1 30 + \ Create Session prh_ready ${DMAAP_SIM_URL} + \ ${resp}= Get Request prh_ready /events/pnfReady headers=${headers} + \ Exit For Loop If '${resp.text}' == '${posted_event_to_dmaap}' + \ Sleep 1s + Should Be Equal ${resp.text} ${posted_event_to_dmaap} + +Start prh + [Timeout] 1 minute ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Evaluate requests.post('${url}',data='${data}', headers=${headers},verify=False) requests - [Return] ${resp} + Create Session prh_start ${PRH_URL} + ${resp}= Get Request prh_start /start headers=${headers} + Should Be Equal ${resp.text} "PRH Service has been started!" -GetCall - [Arguments] ${url} +Stop prh + [Timeout] 1 minute ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Evaluate requests.get('${url}', headers=${headers}, verify=False) requests - [Return] ${resp} + Create Session prh_stop ${PRH_URL} + ${resp}= Get Request prh_stop /stopPrh headers=${headers} + Should Be Equal ${resp.text} "PRH Service has already been stopped!" + +Set pnfs name in AAI + [Arguments] ${pnfs_name} + [Timeout] 1 minute + ${headers}= Create Dictionary Accept=application/json Content-Type=text/html + Create Session set_pnfs_in_aai ${AAI_SIM_URL} + ${resp}= Put Request set_pnfs_in_aai /set_pnfs headers=${headers} data=${pnfs_name} + Should Be Equal As Strings ${resp.status_code} 200 + Log To Console ${resp.text} + +Set get event in DMAAP + [Arguments] ${event_in_dmaap} ${headers} + [Timeout] 1 minute + Create Session set_get_event ${DMAAP_SIM_URL} + ${resp}= Put Request set_get_event /set_get_event headers=${headers} data=${event_in_dmaap} + Should Be Equal As Strings ${resp.status_code} 200 + Log To Console ${resp.text} diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/CommonEventFormat_28.3.json b/test/csit/tests/dcaegen2/prh_testcases/resources/CommonEventFormat_28.3.json deleted file mode 100644 index 90f6d81a5..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/CommonEventFormat_28.3.json +++ /dev/null @@ -1,1866 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - - "definitions": { - "attCopyrightNotice": { - "description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)", - "type": "object", - "properties": { - "useAndRedistribution": { - "description": "You may not use this file except in compliance with the License.You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0", - "type": "string" - }, - "licenseLink": { - "description": "http://www.apache.org/licenses/LICENSE-2.0", - "type":"string" - }, - "condition1": { - "description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,", - "type": "string" - }, - "condition2": { - "description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.", - "type": "string" - }, - "condition3": { - "description": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.", - "type": "string" - }, - "condition4": { - "description": "See the License for the specific language governing permissions and limitations under the License.", - "type": "string" - }, - "Trademarks": { - "description": "ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.", - "type": "string" - } - } - }, - - "codecsInUse": { - "description": "number of times an identified codec was used over the measurementInterval", - "type": "object", - "properties": { - "codecIdentifier": { "type": "string" }, - "numberInUse": { "type": "integer" } - }, - "required": [ "codecIdentifier", "numberInUse" ] - }, - "command": { - "description": "command from an event collector toward an event source", - "type": "object", - "properties": { - "commandType": { - "type": "string", - "enum": [ - "heartbeatIntervalChange", - "measurementIntervalChange", - "provideThrottlingState", - "throttlingSpecification" - ] - }, - "eventDomainThrottleSpecification": { "$ref": "#/definitions/eventDomainThrottleSpecification" }, - "heartbeatInterval": { "type": "integer" }, - "measurementInterval": { "type": "integer" } - }, - "required": [ "commandType" ] - }, - "commandList": { - "description": "array of commands from an event collector toward an event source", - "type": "array", - "items": { - "$ref": "#/definitions/command" - }, - "minItems": 0 - }, - "commonEventHeader": { - "description": "fields common to all events", - "type": "object", - "properties": { - "domain": { - "description": "the eventing domain associated with the event", - "type": "string", - "enum": [ - "fault", - "heartbeat", - "measurementsForVfScaling", - "mobileFlow", - "other", - "sipSignaling", - "stateChange", - "syslog", - "thresholdCrossingAlert", - "voiceQuality" - ] - }, - "eventId": { - "description": "event key that is unique to the event source", - "type": "string" - }, - "eventName": { - "description": "unique event name", - "type": "string" - }, - "eventType": { - "description": "for example - applicationVnf, guestOS, hostOS, platform", - "type": "string" - }, - "internalHeaderFields": { "$ref": "#/definitions/internalHeaderFields" }, - "lastEpochMicrosec": { - "description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds", - "type": "number" - }, - "nfcNamingCode": { - "description": "3 character network function component type, aligned with vfc naming standards", - "type": "string" - }, - "nfNamingCode": { - "description": "4 character network function type, aligned with vnf naming standards", - "type": "string" - }, - "priority": { - "description": "processing priority", - "type": "string", - "enum": [ - "High", - "Medium", - "Normal", - "Low" - ] - }, - "reportingEntityId": { - "description": "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process", - "type": "string" - }, - "reportingEntityName": { - "description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName", - "type": "string" - }, - "sequence": { - "description": "ordering of events communicated by an event source instance or 0 if not needed", - "type": "integer" - }, - "sourceId": { - "description": "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process", - "type": "string" - }, - "sourceName": { - "description": "name of the entity experiencing the event issue", - "type": "string" - }, - "startEpochMicrosec": { - "description": "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds", - "type": "number" - }, - "version": { - "description": "version of the event header", - "type": "number" - } - }, - "required": [ "domain", "eventId", "eventName", "lastEpochMicrosec", - "priority", "reportingEntityName", "sequence", "sourceName", - "startEpochMicrosec", "version" ] - }, - "counter": { - "description": "performance counter", - "type": "object", - "properties": { - "criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] }, - "name": { "type": "string" }, - "thresholdCrossed": { "type": "string" }, - "value": { "type": "string"} - }, - "required": [ "criticality", "name", "thresholdCrossed", "value" ] - }, - "cpuUsage": { - "description": "usage of an identified CPU", - "type": "object", - "properties": { - "cpuIdentifier": { - "description": "cpu identifer", - "type": "string" - }, - "cpuIdle": { - "description": "percentage of CPU time spent in the idle task", - "type": "number" - }, - "cpuUsageInterrupt": { - "description": "percentage of time spent servicing interrupts", - "type": "number" - }, - "cpuUsageNice": { - "description": "percentage of time spent running user space processes that have been niced", - "type": "number" - }, - "cpuUsageSoftIrq": { - "description": "percentage of time spent handling soft irq interrupts", - "type": "number" - }, - "cpuUsageSteal": { - "description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing", - "type": "number" - }, - "cpuUsageSystem": { - "description": "percentage of time spent on system tasks running the kernel", - "type": "number" - }, - "cpuUsageUser": { - "description": "percentage of time spent running un-niced user space processes", - "type": "number" - }, - "cpuWait": { - "description": "percentage of CPU time spent waiting for I/O operations to complete", - "type": "number" - }, - "percentUsage": { - "description": "aggregate cpu usage of the virtual machine on which the VNFC reporting the event is running", - "type": "number" - } - }, - "required": [ "cpuIdentifier", "percentUsage" ] - }, - "diskUsage": { - "description": "usage of an identified disk", - "type": "object", - "properties": { - "diskIdentifier": { - "description": "disk identifier", - "type": "string" - }, - "diskIoTimeAvg": { - "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the average over the measurement interval", - "type": "number" - }, - "diskIoTimeLast": { - "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the last value measurement within the measurement interval", - "type": "number" - }, - "diskIoTimeMax": { - "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the maximum value measurement within the measurement interval", - "type": "number" - }, - "diskIoTimeMin": { - "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the minimum value measurement within the measurement interval", - "type": "number" - }, - "diskMergedReadAvg": { - "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskMergedReadLast": { - "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval", - "type": "number" - }, - "diskMergedReadMax": { - "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval", - "type": "number" - }, - "diskMergedReadMin": { - "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval", - "type": "number" - }, - "diskMergedWriteAvg": { - "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskMergedWriteLast": { - "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval", - "type": "number" - }, - "diskMergedWriteMax": { - "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval", - "type": "number" - }, - "diskMergedWriteMin": { - "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval", - "type": "number" - }, - "diskOctetsReadAvg": { - "description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskOctetsReadLast": { - "description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval", - "type": "number" - }, - "diskOctetsReadMax": { - "description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval", - "type": "number" - }, - "diskOctetsReadMin": { - "description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval", - "type": "number" - }, - "diskOctetsWriteAvg": { - "description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskOctetsWriteLast": { - "description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval", - "type": "number" - }, - "diskOctetsWriteMax": { - "description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval", - "type": "number" - }, - "diskOctetsWriteMin": { - "description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval", - "type": "number" - }, - "diskOpsReadAvg": { - "description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskOpsReadLast": { - "description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval", - "type": "number" - }, - "diskOpsReadMax": { - "description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval", - "type": "number" - }, - "diskOpsReadMin": { - "description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval", - "type": "number" - }, - "diskOpsWriteAvg": { - "description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskOpsWriteLast": { - "description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval", - "type": "number" - }, - "diskOpsWriteMax": { - "description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval", - "type": "number" - }, - "diskOpsWriteMin": { - "description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval", - "type": "number" - }, - "diskPendingOperationsAvg": { - "description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskPendingOperationsLast": { - "description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval", - "type": "number" - }, - "diskPendingOperationsMax": { - "description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval", - "type": "number" - }, - "diskPendingOperationsMin": { - "description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval", - "type": "number" - }, - "diskTimeReadAvg": { - "description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskTimeReadLast": { - "description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval", - "type": "number" - }, - "diskTimeReadMax": { - "description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval", - "type": "number" - }, - "diskTimeReadMin": { - "description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval", - "type": "number" - }, - "diskTimeWriteAvg": { - "description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval", - "type": "number" - }, - "diskTimeWriteLast": { - "description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval", - "type": "number" - }, - "diskTimeWriteMax": { - "description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval", - "type": "number" - }, - "diskTimeWriteMin": { - "description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval", - "type": "number" - } - }, - "required": [ "diskIdentifier" ] - }, - "endOfCallVqmSummaries": { - "description": "provides end of call voice quality metrics", - "type": "object", - "properties": { - "adjacencyName": { - "description": " adjacency name", - "type": "string" - }, - "endpointDescription": { - "description": "Either Caller or Callee", - "type": "string", - "enum": ["Caller", "Callee"] - }, - "endpointJitter": { - "description": "", - "type": "number" - }, - "endpointRtpOctetsDiscarded": { - "description": "", - "type": "number" - }, - "endpointRtpOctetsReceived": { - "description": "", - "type": "number" - }, - "endpointRtpOctetsSent": { - "description": "", - "type": "number" - }, - "endpointRtpPacketsDiscarded": { - "description": "", - "type": "number" - }, - "endpointRtpPacketsReceived": { - "description": "", - "type": "number" - }, - "endpointRtpPacketsSent": { - "description": "", - "type": "number" - }, - "localJitter": { - "description": "", - "type": "number" - }, - "localRtpOctetsDiscarded": { - "description": "", - "type": "number" - }, - "localRtpOctetsReceived": { - "description": "", - "type": "number" - }, - "localRtpOctetsSent": { - "description": "", - "type": "number" - }, - "localRtpPacketsDiscarded": { - "description": "", - "type": "number" - }, - "localRtpPacketsReceived": { - "description": "", - "type": "number" - }, - "localRtpPacketsSent": { - "description": "", - "type": "number" - }, - "mosCqe": { - "description": "1-5 1dp", - "type": "number" - }, - "packetsLost": { - "description": "", - "type": "number" - }, - "packetLossPercent": { - "description" : "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)", - "type": "number" - }, - "rFactor": { - "description": "0-100", - "type": "number" - }, - "roundTripDelay": { - "description": "millisecs", - "type": "number" - } - }, - "required": [ "adjacencyName", "endpointDescription" ] - }, - "event": { - "description": "the root level of the common event format", - "type": "object", - "properties": { - "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" }, - "faultFields": { "$ref": "#/definitions/faultFields" }, - "heartbeatFields": { "$ref": "#/definitions/heartbeatFields" }, - "measurementsForVfScalingFields": { "$ref": "#/definitions/measurementsForVfScalingFields" }, - "mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" }, - "otherFields": { "$ref": "#/definitions/otherFields" }, - "sipSignalingFields": { "$ref": "#/definitions/sipSignalingFields" }, - "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" }, - "syslogFields": { "$ref": "#/definitions/syslogFields" }, - "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" }, - "voiceQualityFields": { "$ref": "#/definitions/voiceQualityFields" } - }, - "required": [ "commonEventHeader" ] - }, - "eventDomainThrottleSpecification": { - "description": "specification of what information to suppress within an event domain", - "type": "object", - "properties": { - "eventDomain": { - "description": "Event domain enum from the commonEventHeader domain field", - "type": "string" - }, - "suppressedFieldNames": { - "description": "List of optional field names in the event block that should not be sent to the Event Listener", - "type": "array", - "items": { - "type": "string" - } - }, - "suppressedNvPairsList": { - "description": "Optional list of specific NvPairsNames to suppress within a given Name-Value Field", - "type": "array", - "items": { - "$ref": "#/definitions/suppressedNvPairs" - } - } - }, - "required": [ "eventDomain" ] - }, - "eventDomainThrottleSpecificationList": { - "description": "array of eventDomainThrottleSpecifications", - "type": "array", - "items": { - "$ref": "#/definitions/eventDomainThrottleSpecification" - }, - "minItems": 0 - }, - "eventList": { - "description": "array of events", - "type": "array", - "items": { - "$ref": "#/definitions/event" - } - }, - "eventThrottlingState": { - "description": "reports the throttling in force at the event source", - "type": "object", - "properties": { - "eventThrottlingMode": { - "description": "Mode the event manager is in", - "type": "string", - "enum": [ - "normal", - "throttled" - ] - }, - "eventDomainThrottleSpecificationList": { "$ref": "#/definitions/eventDomainThrottleSpecificationList" } - }, - "required": [ "eventThrottlingMode" ] - }, - "faultFields": { - "description": "fields specific to fault events", - "type": "object", - "properties": { - "alarmAdditionalInformation": { - "description": "additional alarm information", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "alarmCondition": { - "description": "alarm condition reported by the device", - "type": "string" - }, - "alarmInterfaceA": { - "description": "card, port, channel or interface name of the device generating the alarm", - "type": "string" - }, - "eventCategory": { - "description": "Event category, for example: license, link, routing, security, signaling", - "type": "string" - }, - "eventSeverity": { - "description": "event severity", - "type": "string", - "enum": [ - "CRITICAL", - "MAJOR", - "MINOR", - "WARNING", - "NORMAL" - ] - }, - "eventSourceType": { - "description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction", - "type": "string" - }, - "faultFieldsVersion": { - "description": "version of the faultFields block", - "type": "number" - }, - "specificProblem": { - "description": "short description of the alarm or problem", - "type": "string" - }, - "vfStatus": { - "description": "virtual function status enumeration", - "type": "string", - "enum": [ - "Active", - "Idle", - "Preparing to terminate", - "Ready to terminate", - "Requesting termination" - ] - } - }, - "required": [ "alarmCondition", "eventSeverity", "eventSourceType", - "faultFieldsVersion", "specificProblem", "vfStatus" ] - }, - "featuresInUse": { - "description": "number of times an identified feature was used over the measurementInterval", - "type": "object", - "properties": { - "featureIdentifier": { "type": "string" }, - "featureUtilization": { "type": "integer" } - }, - "required": [ "featureIdentifier", "featureUtilization" ] - }, - "field": { - "description": "name value pair", - "type": "object", - "properties": { - "name": { "type": "string" }, - "value": { "type": "string" } - }, - "required": [ "name", "value" ] - }, - "filesystemUsage": { - "description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second", - "type": "object", - "properties": { - "blockConfigured": { "type": "number" }, - "blockIops": { "type": "number" }, - "blockUsed": { "type": "number" }, - "ephemeralConfigured": { "type": "number" }, - "ephemeralIops": { "type": "number" }, - "ephemeralUsed": { "type": "number" }, - "filesystemName": { "type": "string" } - }, - "required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured", - "ephemeralIops", "ephemeralUsed", "filesystemName" ] - }, - "gtpPerFlowMetrics": { - "description": "Mobility GTP Protocol per flow metrics", - "type": "object", - "properties": { - "avgBitErrorRate": { - "description": "average bit error rate", - "type": "number" - }, - "avgPacketDelayVariation": { - "description": "Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets", - "type": "number" - }, - "avgPacketLatency": { - "description": "average delivery latency", - "type": "number" - }, - "avgReceiveThroughput": { - "description": "average receive throughput", - "type": "number" - }, - "avgTransmitThroughput": { - "description": "average transmit throughput", - "type": "number" - }, - "durConnectionFailedStatus": { - "description": "duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval", - "type": "number" - }, - "durTunnelFailedStatus": { - "description": "Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval", - "type": "number" - }, - "flowActivatedBy": { - "description": "Endpoint activating the flow", - "type": "string" - }, - "flowActivationEpoch": { - "description": "Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available", - "type": "number" - }, - "flowActivationMicrosec": { - "description": "Integer microseconds for the start of the flow connection", - "type": "number" - }, - "flowActivationTime": { - "description": "time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800", - "type": "string" - }, - "flowDeactivatedBy": { - "description": "Endpoint deactivating the flow", - "type": "string" - }, - "flowDeactivationEpoch": { - "description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time", - "type": "number" - }, - "flowDeactivationMicrosec": { - "description": "Integer microseconds for the start of the flow connection", - "type": "number" - }, - "flowDeactivationTime": { - "description": "Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800", - "type": "string" - }, - "flowStatus": { - "description": "connection status at reporting time as a working / inactive / failed indicator value", - "type": "string" - }, - "gtpConnectionStatus": { - "description": "Current connection state at reporting time", - "type": "string" - }, - "gtpTunnelStatus": { - "description": "Current tunnel state at reporting time", - "type": "string" - }, - "ipTosCountList": { - "description": "array of key: value pairs where the keys are drawn from the IP Type-of-Service identifiers which range from '0' to '255', and the values are the count of packets that had those ToS identifiers in the flow", - "type": "array", - "items": { - "type": "array", - "items": [ - { "type": "string" }, - { "type": "number" } - ] - } - }, - "ipTosList": { - "description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'", - "type": "array", - "items": { - "type": "string" - } - }, - "largePacketRtt": { - "description": "large packet round trip time", - "type": "number" - }, - "largePacketThreshold": { - "description": "large packet threshold being applied", - "type": "number" - }, - "maxPacketDelayVariation": { - "description": "Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets", - "type": "number" - }, - "maxReceiveBitRate": { - "description": "maximum receive bit rate", - "type": "number" - }, - "maxTransmitBitRate": { - "description": "maximum transmit bit rate", - "type": "number" - }, - "mobileQciCosCountList": { - "description": "array of key: value pairs where the keys are drawn from LTE QCI or UMTS class of service strings, and the values are the count of packets that had those strings in the flow", - "type": "array", - "items": { - "type": "array", - "items": [ - { "type": "string" }, - { "type": "number" } - ] - } - }, - "mobileQciCosList": { - "description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow", - "type": "array", - "items": { - "type": "string" - } - }, - "numActivationFailures": { - "description": "Number of failed activation requests, as observed by the reporting node", - "type": "number" - }, - "numBitErrors": { - "description": "number of errored bits", - "type": "number" - }, - "numBytesReceived": { - "description": "number of bytes received, including retransmissions", - "type": "number" - }, - "numBytesTransmitted": { - "description": "number of bytes transmitted, including retransmissions", - "type": "number" - }, - "numDroppedPackets": { - "description": "number of received packets dropped due to errors per virtual interface", - "type": "number" - }, - "numGtpEchoFailures": { - "description": "Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2", - "type": "number" - }, - "numGtpTunnelErrors": { - "description": "Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1", - "type": "number" - }, - "numHttpErrors": { - "description": "Http error count", - "type": "number" - }, - "numL7BytesReceived": { - "description": "number of tunneled layer 7 bytes received, including retransmissions", - "type": "number" - }, - "numL7BytesTransmitted": { - "description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions", - "type": "number" - }, - "numLostPackets": { - "description": "number of lost packets", - "type": "number" - }, - "numOutOfOrderPackets": { - "description": "number of out-of-order packets", - "type": "number" - }, - "numPacketErrors": { - "description": "number of errored packets", - "type": "number" - }, - "numPacketsReceivedExclRetrans": { - "description": "number of packets received, excluding retransmission", - "type": "number" - }, - "numPacketsReceivedInclRetrans": { - "description": "number of packets received, including retransmission", - "type": "number" - }, - "numPacketsTransmittedInclRetrans": { - "description": "number of packets transmitted, including retransmissions", - "type": "number" - }, - "numRetries": { - "description": "number of packet retries", - "type": "number" - }, - "numTimeouts": { - "description": "number of packet timeouts", - "type": "number" - }, - "numTunneledL7BytesReceived": { - "description": "number of tunneled layer 7 bytes received, excluding retransmissions", - "type": "number" - }, - "roundTripTime": { - "description": "round trip time", - "type": "number" - }, - "tcpFlagCountList": { - "description": "array of key: value pairs where the keys are drawn from TCP Flags and the values are the count of packets that had that TCP Flag in the flow", - "type": "array", - "items": { - "type": "array", - "items": [ - { "type": "string" }, - { "type": "number" } - ] - } - }, - "tcpFlagList": { - "description": "Array of unique TCP Flags observed in the flow", - "type": "array", - "items": { - "type": "string" - } - }, - "timeToFirstByte": { - "description": "Time in milliseconds between the connection activation and first byte received", - "type": "number" - } - }, - "required": [ "avgBitErrorRate", "avgPacketDelayVariation", "avgPacketLatency", - "avgReceiveThroughput", "avgTransmitThroughput", - "flowActivationEpoch", "flowActivationMicrosec", - "flowDeactivationEpoch", "flowDeactivationMicrosec", - "flowDeactivationTime", "flowStatus", - "maxPacketDelayVariation", "numActivationFailures", - "numBitErrors", "numBytesReceived", "numBytesTransmitted", - "numDroppedPackets", "numL7BytesReceived", - "numL7BytesTransmitted", "numLostPackets", - "numOutOfOrderPackets", "numPacketErrors", - "numPacketsReceivedExclRetrans", - "numPacketsReceivedInclRetrans", - "numPacketsTransmittedInclRetrans", - "numRetries", "numTimeouts", "numTunneledL7BytesReceived", - "roundTripTime", "timeToFirstByte" - ] - }, - "heartbeatFields": { - "description": "optional field block for fields specific to heartbeat events", - "type": "object", - "properties": { - "additionalFields": { - "description": "additional heartbeat fields if needed", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "heartbeatFieldsVersion": { - "description": "version of the heartbeatFields block", - "type": "number" - }, - "heartbeatInterval": { - "description": "current heartbeat interval in seconds", - "type": "integer" - } - }, - "required": [ "heartbeatFieldsVersion", "heartbeatInterval" ] - }, - "internalHeaderFields": { - "description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources", - "type": "object" - }, - "jsonObject": { - "description": "json object schema, name and other meta-information along with one or more object instances", - "type": "object", - "properties": { - "objectInstances": { - "description": "one or more instances of the jsonObject", - "type": "array", - "items": { - "$ref": "#/definitions/jsonObjectInstance" - } - }, - "objectName": { - "description": "name of the JSON Object", - "type": "string" - }, - "objectSchema": { - "description": "json schema for the object", - "type": "string" - }, - "objectSchemaUrl": { - "description": "Url to the json schema for the object", - "type": "string" - }, - "nfSubscribedObjectName": { - "description": "name of the object associated with the nfSubscriptonId", - "type": "string" - }, - "nfSubscriptionId": { - "description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject", - "type": "string" - } - }, - "required": [ "objectInstances", "objectName" ] - }, - "jsonObjectInstance": { - "description": "meta-information about an instance of a jsonObject along with the actual object instance", - "type": "object", - "properties": { - "objectInstance": { - "description": "an instance conforming to the jsonObject schema", - "type": "object" - }, - "objectInstanceEpochMicrosec": { - "description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds", - "type": "number" - }, - "objectKeys": { - "description": "an ordered set of keys that identifies this particular instance of jsonObject", - "type": "array", - "items": { - "$ref": "#/definitions/key" - } - } - }, - "required": [ "objectInstance" ] - }, - "key": { - "description": "tuple which provides the name of a key along with its value and relative order", - "type": "object", - "properties": { - "keyName": { - "description": "name of the key", - "type": "string" - }, - "keyOrder": { - "description": "relative sequence or order of the key with respect to other keys", - "type": "integer" - }, - "keyValue": { - "description": "value of the key", - "type": "string" - } - }, - "required": [ "keyName" ] - }, - "latencyBucketMeasure": { - "description": "number of counts falling within a defined latency bucket", - "type": "object", - "properties": { - "countsInTheBucket": { "type": "number" }, - "highEndOfLatencyBucket": { "type": "number" }, - "lowEndOfLatencyBucket": { "type": "number" } - }, - "required": [ "countsInTheBucket" ] - }, - "measurementsForVfScalingFields": { - "description": "measurementsForVfScaling fields", - "type": "object", - "properties": { - "additionalFields": { - "description": "additional name-value-pair fields", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "additionalMeasurements": { - "description": "array of named name-value-pair arrays", - "type": "array", - "items": { - "$ref": "#/definitions/namedArrayOfFields" - } - }, - "additionalObjects": { - "description": "array of JSON objects described by name, schema and other meta-information", - "type": "array", - "items": { - "$ref": "#/definitions/jsonObject" - } - }, - "codecUsageArray": { - "description": "array of codecs in use", - "type": "array", - "items": { - "$ref": "#/definitions/codecsInUse" - } - }, - "concurrentSessions": { - "description": "peak concurrent sessions for the VM or VNF over the measurementInterval", - "type": "integer" - }, - "configuredEntities": { - "description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the VNF", - "type": "integer" - }, - "cpuUsageArray": { - "description": "usage of an array of CPUs", - "type": "array", - "items": { - "$ref": "#/definitions/cpuUsage" - } - }, - "diskUsageArray": { - "description": "usage of an array of disks", - "type": "array", - "items": { - "$ref": "#/definitions/diskUsage" - } - }, - "featureUsageArray": { - "description": "array of features in use", - "type": "array", - "items": { - "$ref": "#/definitions/featuresInUse" - } - }, - "filesystemUsageArray": { - "description": "filesystem usage of the VM on which the VNFC reporting the event is running", - "type": "array", - "items": { - "$ref": "#/definitions/filesystemUsage" - } - }, - "latencyDistribution": { - "description": "array of integers representing counts of requests whose latency in milliseconds falls within per-VNF configured ranges", - "type": "array", - "items": { - "$ref": "#/definitions/latencyBucketMeasure" - } - }, - "meanRequestLatency": { - "description": "mean seconds required to respond to each request for the VM on which the VNFC reporting the event is running", - "type": "number" - }, - "measurementInterval": { - "description": "interval over which measurements are being reported in seconds", - "type": "number" - }, - "measurementsForVfScalingVersion": { - "description": "version of the measurementsForVfScaling block", - "type": "number" - }, - "memoryUsageArray": { - "description": "memory usage of an array of VMs", - "type": "array", - "items": { - "$ref": "#/definitions/memoryUsage" - } - }, - "numberOfMediaPortsInUse": { - "description": "number of media ports in use", - "type": "integer" - }, - "requestRate": { - "description": "peak rate of service requests per second to the VNF over the measurementInterval", - "type": "number" - }, - "vnfcScalingMetric": { - "description": "represents busy-ness of the VNF from 0 to 100 as reported by the VNFC", - "type": "integer" - }, - "vNicPerformanceArray": { - "description": "usage of an array of virtual network interface cards", - "type": "array", - "items": { - "$ref": "#/definitions/vNicPerformance" - } - } - }, - "required": [ "measurementInterval", "measurementsForVfScalingVersion" ] - }, - "memoryUsage": { - "description": "memory usage of an identified virtual machine", - "type": "object", - "properties": { - "memoryBuffered": { - "description": "kibibytes of temporary storage for raw disk blocks", - "type": "number" - }, - "memoryCached": { - "description": "kibibytes of memory used for cache", - "type": "number" - }, - "memoryConfigured": { - "description": "kibibytes of memory configured in the virtual machine on which the VNFC reporting the event is running", - "type": "number" - }, - "memoryFree": { - "description": "kibibytes of physical RAM left unused by the system", - "type": "number" - }, - "memorySlabRecl": { - "description": "the part of the slab that can be reclaimed such as caches measured in kibibytes", - "type": "number" - }, - "memorySlabUnrecl": { - "description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes", - "type": "number" - }, - "memoryUsed": { - "description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes", - "type": "number" - }, - "vmIdentifier": { - "description": "virtual machine identifier associated with the memory metrics", - "type": "string" - } - }, - "required": [ "memoryFree", "memoryUsed", "vmIdentifier" ] - }, - "mobileFlowFields": { - "description": "mobileFlow fields", - "type": "object", - "properties": { - "additionalFields": { - "description": "additional mobileFlow fields if needed", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "applicationType": { - "description": "Application type inferred", - "type": "string" - }, - "appProtocolType": { - "description": "application protocol", - "type": "string" - }, - "appProtocolVersion": { - "description": "application protocol version", - "type": "string" - }, - "cid": { - "description": "cell id", - "type": "string" - }, - "connectionType": { - "description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc", - "type": "string" - }, - "ecgi": { - "description": "Evolved Cell Global Id", - "type": "string" - }, - "flowDirection": { - "description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow", - "type": "string" - }, - "gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" }, - "gtpProtocolType": { - "description": "GTP protocol", - "type": "string" - }, - "gtpVersion": { - "description": "GTP protocol version", - "type": "string" - }, - "httpHeader": { - "description": "HTTP request header, if the flow connects to a node referenced by HTTP", - "type": "string" - }, - "imei": { - "description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device", - "type": "string" - }, - "imsi": { - "description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device", - "type": "string" - }, - "ipProtocolType": { - "description": "IP protocol type e.g., TCP, UDP, RTP...", - "type": "string" - }, - "ipVersion": { - "description": "IP protocol version e.g., IPv4, IPv6", - "type": "string" - }, - "lac": { - "description": "location area code", - "type": "string" - }, - "mcc": { - "description": "mobile country code", - "type": "string" - }, - "mnc": { - "description": "mobile network code", - "type": "string" - }, - "mobileFlowFieldsVersion": { - "description": "version of the mobileFlowFields block", - "type": "number" - }, - "msisdn": { - "description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device", - "type": "string" - }, - "otherEndpointIpAddress": { - "description": "IP address for the other endpoint, as used for the flow being reported on", - "type": "string" - }, - "otherEndpointPort": { - "description": "IP Port for the reporting entity, as used for the flow being reported on", - "type": "integer" - }, - "otherFunctionalRole": { - "description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...", - "type": "string" - }, - "rac": { - "description": "routing area code", - "type": "string" - }, - "radioAccessTechnology": { - "description": "Radio Access Technology e.g., 2G, 3G, LTE", - "type": "string" - }, - "reportingEndpointIpAddr": { - "description": "IP address for the reporting entity, as used for the flow being reported on", - "type": "string" - }, - "reportingEndpointPort": { - "description": "IP port for the reporting entity, as used for the flow being reported on", - "type": "integer" - }, - "sac": { - "description": "service area code", - "type": "string" - }, - "samplingAlgorithm": { - "description": "Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied", - "type": "integer" - }, - "tac": { - "description": "transport area code", - "type": "string" - }, - "tunnelId": { - "description": "tunnel identifier", - "type": "string" - }, - "vlanId": { - "description": "VLAN identifier used by this flow", - "type": "string" - } - }, - "required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType", "ipVersion", - "mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort", - "reportingEndpointIpAddr", "reportingEndpointPort" ] - }, - "namedArrayOfFields": { - "description": "an array of name value pairs along with a name for the array", - "type": "object", - "properties": { - "name": { "type": "string" }, - "arrayOfFields": { - "description": "array of name value pairs", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - } - }, - "required": [ "name", "arrayOfFields" ] - }, - "otherFields": { - "description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration", - "type": "object", - "properties": { - "hashOfNameValuePairArrays": { - "description": "array of named name-value-pair arrays", - "type": "array", - "items": { - "$ref": "#/definitions/namedArrayOfFields" - } - }, - "jsonObjects": { - "description": "array of JSON objects described by name, schema and other meta-information", - "type": "array", - "items": { - "$ref": "#/definitions/jsonObject" - } - }, - "nameValuePairs": { - "description": "array of name-value pairs", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "otherFieldsVersion": { - "description": "version of the otherFields block", - "type": "number" - } - }, - "required": [ "otherFieldsVersion" ] - }, - "requestError": { - "description": "standard request error data structure", - "type": "object", - "properties": { - "messageId": { - "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception", - "type": "string" - }, - "text": { - "description": "Message text, with replacement variables marked with %n, where n is an index into the list of elements, starting at 1", - "type": "string" - }, - "url": { - "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents", - "type": "string" - }, - "variables": { - "description": "List of zero or more strings that represent the contents of the variables used by the message text", - "type": "string" - } - }, - "required": [ "messageId", "text" ] - }, - "sipSignalingFields": { - "description": "sip signaling fields", - "type": "object", - "properties": { - "additionalInformation": { - "description": "additional sip signaling fields if needed", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "compressedSip": { - "description": "the full SIP request/response including headers and bodies", - "type": "string" - }, - "correlator": { - "description": "this is the same for all events on this call", - "type": "string" - }, - "localIpAddress": { - "description": "IP address on VNF", - "type": "string" - }, - "localPort": { - "description": "port on VNF", - "type": "string" - }, - "remoteIpAddress": { - "description": "IP address of peer endpoint", - "type": "string" - }, - "remotePort": { - "description": "port of peer endpoint", - "type": "string" - }, - "sipSignalingFieldsVersion": { - "description": "version of the sipSignalingFields block", - "type": "number" - }, - "summarySip": { - "description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)", - "type": "string" - }, - "vendorVnfNameFields": { - "$ref": "#/definitions/vendorVnfNameFields" - } - }, - "required": [ "correlator", "localIpAddress", "localPort", "remoteIpAddress", - "remotePort", "sipSignalingFieldsVersion", "vendorVnfNameFields" ] - }, - "stateChangeFields": { - "description": "stateChange fields", - "type": "object", - "properties": { - "additionalFields": { - "description": "additional stateChange fields if needed", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "newState": { - "description": "new state of the entity", - "type": "string", - "enum": [ - "inService", - "maintenance", - "outOfService" - ] - }, - "oldState": { - "description": "previous state of the entity", - "type": "string", - "enum": [ - "inService", - "maintenance", - "outOfService" - ] - }, - "stateChangeFieldsVersion": { - "description": "version of the stateChangeFields block", - "type": "number" - }, - "stateInterface": { - "description": "card or port name of the entity that changed state", - "type": "string" - } - }, - "required": [ "newState", "oldState", "stateChangeFieldsVersion", "stateInterface" ] - }, - "suppressedNvPairs": { - "description": "List of specific NvPairsNames to suppress within a given Name-Value Field for event Throttling", - "type": "object", - "properties": { - "nvPairFieldName": { - "description": "Name of the field within which are the nvpair names to suppress", - "type": "string" - }, - "suppressedNvPairNames": { - "description": "Array of nvpair names to suppress within the nvpairFieldName", - "type": "array", - "items": { - "type": "string" - } - } - }, - "required": [ "nvPairFieldName", "suppressedNvPairNames" ] - }, - "syslogFields": { - "description": "sysLog fields", - "type": "object", - "properties": { - "additionalFields": { - "description": "additional syslog fields if needed provided as name=value delimited by a pipe ‘|’ symbol, for example: 'name1=value1|name2=value2|…'", - "type": "string" - }, - "eventSourceHost": { - "description": "hostname of the device", - "type": "string" - }, - "eventSourceType": { - "description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction", - "type": "string" - }, - "syslogFacility": { - "description": "numeric code from 0 to 23 for facility--see table in documentation", - "type": "integer" - }, - "syslogFieldsVersion": { - "description": "version of the syslogFields block", - "type": "number" - }, - "syslogMsg": { - "description": "syslog message", - "type": "string" - }, - "syslogPri": { - "description": "0-192 combined severity and facility", - "type": "integer" - }, - "syslogProc": { - "description": "identifies the application that originated the message", - "type": "string" - }, - "syslogProcId": { - "description": "a change in the value of this field indicates a discontinuity in syslog reporting", - "type": "number" - }, - "syslogSData": { - "description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs", - "type": "string" - }, - "syslogSdId": { - "description": "0-32 char in format name@number for example ourSDID@32473", - "type": "string" - }, - "syslogSev": { - "description": "numerical Code for severity derived from syslogPri as remaider of syslogPri / 8", - "type": "string", - "enum": [ - "Alert", - "Critical", - "Debug", - "Emergency", - "Error", - "Info", - "Notice", - "Warning" - ] - }, - "syslogTag": { - "description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided", - "type": "string" - }, - "syslogVer": { - "description": "IANA assigned version of the syslog protocol specification - typically 1", - "type": "number" - } - }, - "required": [ "eventSourceType", "syslogFieldsVersion", "syslogMsg", "syslogTag" ] - }, - "thresholdCrossingAlertFields": { - "description": "fields specific to threshold crossing alert events", - "type": "object", - "properties": { - "additionalFields": { - "description": "additional threshold crossing alert fields if needed", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "additionalParameters": { - "description": "performance counters", - "type": "array", - "items": { - "$ref": "#/definitions/counter" - } - }, - "alertAction": { - "description": "Event action", - "type": "string", - "enum": [ - "CLEAR", - "CONT", - "SET" - ] - }, - "alertDescription": { - "description": "Unique short alert description such as IF-SHUB-ERRDROP", - "type": "string" - }, - "alertType": { - "description": "Event type", - "type": "string", - "enum": [ - "CARD-ANOMALY", - "ELEMENT-ANOMALY", - "INTERFACE-ANOMALY", - "SERVICE-ANOMALY" - ] - }, - "alertValue": { - "description": "Calculated API value (if applicable)", - "type": "string" - }, - "associatedAlertIdList": { - "description": "List of eventIds associated with the event being reported", - "type": "array", - "items": { "type": "string" } - }, - "collectionTimestamp": { - "description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800", - "type": "string" - }, - "dataCollector": { - "description": "Specific performance collector instance used", - "type": "string" - }, - "elementType": { - "description": "type of network element - internal ATT field", - "type": "string" - }, - "eventSeverity": { - "description": "event severity or priority", - "type": "string", - "enum": [ - "CRITICAL", - "MAJOR", - "MINOR", - "WARNING", - "NORMAL" - ] - }, - "eventStartTimestamp": { - "description": "Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800", - "type": "string" - }, - "interfaceName": { - "description": "Physical or logical port or card (if applicable)", - "type": "string" - }, - "networkService": { - "description": "network name - internal ATT field", - "type": "string" - }, - "possibleRootCause": { - "description": "Reserved for future use", - "type": "string" - }, - "thresholdCrossingFieldsVersion": { - "description": "version of the thresholdCrossingAlertFields block", - "type": "number" - } - }, - "required": [ - "additionalParameters", - "alertAction", - "alertDescription", - "alertType", - "collectionTimestamp", - "eventSeverity", - "eventStartTimestamp", - "thresholdCrossingFieldsVersion" - ] - }, - "vendorVnfNameFields": { - "description": "provides vendor, vnf and vfModule identifying information", - "type": "object", - "properties": { - "vendorName": { - "description": "VNF vendor name", - "type": "string" - }, - "vfModuleName": { - "description": "ASDC vfModuleName for the vfModule generating the event", - "type": "string" - }, - "vnfName": { - "description": "ASDC modelName for the VNF generating the event", - "type": "string" - } - }, - "required": [ "vendorName" ] - }, - "vNicPerformance": { - "description": "describes the performance and errors of an identified virtual network interface card", - "type": "object", - "properties": { - "receivedBroadcastPacketsAccumulated": { - "description": "Cumulative count of broadcast packets received as read at the end of the measurement interval", - "type": "number" - }, - "receivedBroadcastPacketsDelta": { - "description": "Count of broadcast packets received within the measurement interval", - "type": "number" - }, - "receivedDiscardedPacketsAccumulated": { - "description": "Cumulative count of discarded packets received as read at the end of the measurement interval", - "type": "number" - }, - "receivedDiscardedPacketsDelta": { - "description": "Count of discarded packets received within the measurement interval", - "type": "number" - }, - "receivedErrorPacketsAccumulated": { - "description": "Cumulative count of error packets received as read at the end of the measurement interval", - "type": "number" - }, - "receivedErrorPacketsDelta": { - "description": "Count of error packets received within the measurement interval", - "type": "number" - }, - "receivedMulticastPacketsAccumulated": { - "description": "Cumulative count of multicast packets received as read at the end of the measurement interval", - "type": "number" - }, - "receivedMulticastPacketsDelta": { - "description": "Count of multicast packets received within the measurement interval", - "type": "number" - }, - "receivedOctetsAccumulated": { - "description": "Cumulative count of octets received as read at the end of the measurement interval", - "type": "number" - }, - "receivedOctetsDelta": { - "description": "Count of octets received within the measurement interval", - "type": "number" - }, - "receivedTotalPacketsAccumulated": { - "description": "Cumulative count of all packets received as read at the end of the measurement interval", - "type": "number" - }, - "receivedTotalPacketsDelta": { - "description": "Count of all packets received within the measurement interval", - "type": "number" - }, - "receivedUnicastPacketsAccumulated": { - "description": "Cumulative count of unicast packets received as read at the end of the measurement interval", - "type": "number" - }, - "receivedUnicastPacketsDelta": { - "description": "Count of unicast packets received within the measurement interval", - "type": "number" - }, - "transmittedBroadcastPacketsAccumulated": { - "description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval", - "type": "number" - }, - "transmittedBroadcastPacketsDelta": { - "description": "Count of broadcast packets transmitted within the measurement interval", - "type": "number" - }, - "transmittedDiscardedPacketsAccumulated": { - "description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval", - "type": "number" - }, - "transmittedDiscardedPacketsDelta": { - "description": "Count of discarded packets transmitted within the measurement interval", - "type": "number" - }, - "transmittedErrorPacketsAccumulated": { - "description": "Cumulative count of error packets transmitted as read at the end of the measurement interval", - "type": "number" - }, - "transmittedErrorPacketsDelta": { - "description": "Count of error packets transmitted within the measurement interval", - "type": "number" - }, - "transmittedMulticastPacketsAccumulated": { - "description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval", - "type": "number" - }, - "transmittedMulticastPacketsDelta": { - "description": "Count of multicast packets transmitted within the measurement interval", - "type": "number" - }, - "transmittedOctetsAccumulated": { - "description": "Cumulative count of octets transmitted as read at the end of the measurement interval", - "type": "number" - }, - "transmittedOctetsDelta": { - "description": "Count of octets transmitted within the measurement interval", - "type": "number" - }, - "transmittedTotalPacketsAccumulated": { - "description": "Cumulative count of all packets transmitted as read at the end of the measurement interval", - "type": "number" - }, - "transmittedTotalPacketsDelta": { - "description": "Count of all packets transmitted within the measurement interval", - "type": "number" - }, - "transmittedUnicastPacketsAccumulated": { - "description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval", - "type": "number" - }, - "transmittedUnicastPacketsDelta": { - "description": "Count of unicast packets transmitted within the measurement interval", - "type": "number" - }, - "valuesAreSuspect": { - "description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions", - "type": "string", - "enum": [ "true", "false" ] - }, - "vNicIdentifier": { - "description": "vNic identification", - "type": "string" - } - }, - "required": [ "valuesAreSuspect", "vNicIdentifier" ] - }, - "voiceQualityFields": { - "description": "provides statistics related to customer facing voice products", - "type": "object", - "properties": { - "additionalInformation": { - "description": "additional voice quality fields if needed", - "type": "array", - "items": { - "$ref": "#/definitions/field" - } - }, - "calleeSideCodec": { - "description": "callee codec for the call", - "type": "string" - }, - "callerSideCodec": { - "description": "caller codec for the call", - "type": "string" - }, - "correlator": { - "description": "this is the same for all events on this call", - "type": "string" - }, - "endOfCallVqmSummaries": { - "$ref": "#/definitions/endOfCallVqmSummaries" - }, - "phoneNumber": { - "description": "phone number associated with the correlator", - "type": "string" - }, - "midCallRtcp": { - "description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers", - "type": "string" - }, - "vendorVnfNameFields": { - "$ref": "#/definitions/vendorVnfNameFields" - }, - "voiceQualityFieldsVersion": { - "description": "version of the voiceQualityFields block", - "type": "number" - } - }, - "required": [ "calleeSideCodec", "callerSideCodec", "correlator", "midCallRtcp", - "vendorVnfNameFields", "voiceQualityFieldsVersion" ] - } - }, - "title": "Event Listener", - "type": "object", - "properties": { - "event": {"$ref": "#/definitions/event"} - } -} diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/DMaaP.py b/test/csit/tests/dcaegen2/prh_testcases/resources/DMaaP.py deleted file mode 100644 index 6daf59b5b..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/DMaaP.py +++ /dev/null @@ -1,157 +0,0 @@ -import BaseHTTPServer -import json -import posixpath -import sys -import urllib -from Queue import Queue - -import jsonschema -from robot.api import logger - -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - -CommonEventSchemaV5 = "./CommonEventFormat_28.3.json" -EvtSchema = None -EventQueue = {"defaultTopic": Queue()} - - -def cleanUpEvent(topic="defaultTopic"): - try: - EventQueue.get(topic).empty() - except Exception as e: - logger.console(str(e)) - logger.console("DMaaP Event enqueue failed") - - -def enqueEvent(evt, topic="defaultTopic"): - if topic not in EventQueue.keys(): - EventQueue.update({topic: Queue()}) - - try: - EventQueue.get(topic).put(evt) - logger.console("DMaaP Event enqued - size=" + str(len(evt))) - return True - except Exception as e: - logger.console(str(e)) - logger.console("DMaaP Event enqueue failed") - return False - - -def dequeEvent(topic="defaultTopic", waitSec=10): - try: - evt = EventQueue.get(topic).get(True, waitSec) - logger.console("DMaaP Event dequeued - size=" + str(len(evt))) - return evt - except Exception as e: - logger.console(str(e)) - logger.console("DMaaP Event dequeue failed") - return None - - -class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler): - - def do_PUT(self): - self.send_response(405) - return - - def do_PATCH(self): - self.send_response(200) - return - - def do_POST(self): - - respCode = 0 - - if 'POST' not in self.requestline: - respCode = 405 - - if respCode == 0: - content_len = int(self.headers.getheader('content-length', 0)) - post_body = self.rfile.read(content_len) - - logger.console("DMaaP Receive Event:\n" + post_body) - - indx = post_body.index("{") - if indx != 0: - post_body = post_body[indx:] - - topic = self.getTopicName(self.path) - - if topic is not None: - logger.console("DMaaP Topic Name: " + topic) - if enqueEvent(post_body, topic) == False: - print "enque event fails" - - global EvtSchema - try: - if EvtSchema is None: - with open(CommonEventSchemaV5) as file: - EvtSchema = json.load(file) - decoded_body = json.loads(post_body) - jsonschema.validate(decoded_body, EvtSchema) - except: - respCode = 400 - - if respCode == 0: - if 'clientThrottlingState' in self.requestline: - self.send_response(204) - else: - self.send_response(200) - self.send_header('Content-Type', 'application/json') - self.end_headers() - self.wfile.write("{\"count\": 1, \"serverTimeMs\": 3}") - self.wfile.close() - else: - self.send_response(respCode) - - return - - def do_GET(self): - self.send_response(200) - self.send_header('Content-Type', 'application/json') - self.end_headers() - self.wfile.write(dequeEvent(self.getTopicName(self.path))) - self.wfile.close() - - return - - def getTopicName(self, path): - # abandon query parameters - path = path.split('?',1)[0] - path = path.split('#',1)[0] - - path = posixpath.normpath(urllib.unquote(path)) - parts = filter(None, path.split('/')) - - if len(parts) > 1 and parts[0] == "events": - return str(parts[1]) - else: - return None - -def _main_ (HandlerClass = DMaaPHandler, - ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): - - if sys.argv[1:]: - port = int(sys.argv[1]) - else: - port = 2222 - - print "Load event schema file: " + CommonEventSchemaV5 - with open(CommonEventSchemaV5) as file: - global EvtSchema - EvtSchema = json.load(file) - - server_address = ('', port) - - HandlerClass.protocol_version = protocol - httpd = ServerClass(server_address, HandlerClass) - - sa = httpd.socket.getsockname() - print "Serving HTTP on", sa[0], "port", sa[1], "..." - httpd.serve_forever() - -if __name__ == '__main__': - _main_() \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/Dockerfile b/test/csit/tests/dcaegen2/prh_testcases/resources/Dockerfile deleted file mode 100644 index e8d1cc178..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM python:2 - -ENV https_proxy "$https_proxy" -#ENV TZ=Europe/Warsaw - -ADD DMaaP.py / -ADD CommonEventFormat_28.3.json / - -RUN pip install jsonschema robotframework - -EXPOSE 2222 - -CMD [ "python", "./DMaaP.py" ] \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py deleted file mode 100644 index 893ed9460..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py +++ /dev/null @@ -1,95 +0,0 @@ -''' -Created on Apr 27, 2018 - -@author: mwagner9 -''' - -import threading -import time - -from robot.api import logger - -import PrhVariables -import Simulator - -st = '{"event":{"correlationID":"NOKQTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}' - -class PrhLibrary(object): - def __init__(self): - pass - - def setup_dmaap_server(self): - return _setup(PrhVariables.DMaaPHttpServerThread, 'DMaaP', PrhVariables.DMaaPIsRobotRun, Simulator, 3904) - - def setup_aai_server(self): - return _setup(PrhVariables.AAIHttpServerThread, 'AAI', PrhVariables.AAIIsRobotRun, Simulator, 3905) - - def shutdown_dmaap_server(self): - return _shutdown(PrhVariables.DMaaPHTTPD, 'DMaaP') - - def shutdown_aai_server(self): - return _shutdown(PrhVariables.AAIHTTPD, 'AAI') - - def is_json_empty(self, response): - logger.info("Enter is_json_empty: response.text: " + response.text) - if response.text is None or len(response.text) < 2: - return 'True' - return 'False' - - def dmaap_collectorTimeStamp_receive(self, search, response): - return _find_element(search, response) - - def AAI_Ipv4_receive(self, search, response): - return _find_element(search, response) - - def AAI_Ipv6_receive(self, search, response): - return _find_element(search, response) - - def check_pnf_ready(self): - if st in Simulator.prh_ready: - return 'true' - return 'false' - -def _setup(serverthread, servername, isrobotrun, module, portNum): - if serverthread is not None: - logger.console('{} Mockup Sever started'.format(servername)) - return "true" - - isrobotrun = True - - module_handler = module.AAIHandler if servername is 'AAI' else module.DMaaPHandler - - module.run_server(module_handler, portNum) - try: - serverthread = threading.Thread(name='{}_HTTPServer'.format(servername), target=module.Httpd.serve_forever) - serverthread.start() - logger.console('{} Mockup Sever started'.format(servername)) - time.sleep(2) - return "true" - except Exception as e: - print (str(e)) - return "false" - -def _shutdown(server, name): - if server is not None: - server.shutdown() - logger.console("{} Server shut down".format(name)) - time.sleep(3) - return "true" - else: - return "false" - -def _find_element(search, response): - while response is not None: - json_data = str(response) - if search in json_data: - return 'true' - return 'false' - -if __name__ == '__main__': - lib = PrhLibrary() - ret = lib.setup_dmaap_server() - print ret - ret = lib.setup_aai_server() - print ret - time.sleep(10) diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py deleted file mode 100644 index 882a4b9ce..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py +++ /dev/null @@ -1,18 +0,0 @@ -''' -Created on Apr 27, 2018 - -@author: mwagner9 -''' - -import os - -def GetEnvironmentVariable(envVarstr): - return os.environ.get(envVarstr) - -DMaaPHttpServerThread = None -DMaaPHTTPD = None -DMaaPIsRobotRun = False - -AAIHttpServerThread = None -AAIHTTPD = None -AAIIsRobotRun = False diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py b/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py deleted file mode 100644 index e746d5a48..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py +++ /dev/null @@ -1,91 +0,0 @@ -''' -Created on May 10, 2018 - -@author: mwagner9 -''' - -import BaseHTTPServer -import re -import sys - -from robot.api import logger - -import PrhVariables - -Httpd = None -prh_ready = '' - -class BaseHandler(BaseHTTPServer.BaseHTTPRequestHandler, object): - def do_GET(self, param1, param2): - """Serve a GET request.""" - #prepare GET response - logger.console(self.raw_requestlinel) - json_string = param1 - if re.search(param2, self.path) is not None: - self.send_response(200) - self.send_header("Content-type", "application/json") - self.end_headers() - self.wfile.write(json_string) - -class AAIHandler(BaseHandler): - def do_PATCH(self): - #prepare PATCH response - logger.console('========') - logger.console(self.raw_requestline) - logger.console('========') - if re.search('/aai/v12/network/pnfs/pnf/NOKQTFCOC540002E', self.path)is not None: - st = '{"ipaddress-v6-oam": "2001:0db8:85a3:0000:0000:8a2e:0370:7334","ipaddress-v4-oam": "11.22.33.156"}' - logger.console('========') - logger.console(self.raw_requestline) - logger.console('========') - self.send_response(200) - - def do_GET(self): - param1 = '{"pnf-name":"NOKQTFCOC540002E", "pnf-id":"NOKQTFCOC540002E","ipaddress-v4-oam":"10.16.123.234","ipaddress-v6-oam":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}' - param2 = '/aai/v12/network/pnfs/pnf/NOKQTFCOC540002E' - super(self.__class__, self).do_GET(param1, param2) - -class DMaaPHandler(BaseHandler): - def do_GET(self): - param1 = '{"event": {"commonEventHeader": {"sourceId":"QTFCOC540002E", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC540002E-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", "pnfVendorName":"Nokia", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"10.16.123.234", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC540002E", "pnfManufactureDate":1516406400}}}' - param2 = '/events/unauthenticated.SEC_OTHER_OUTPUT/OpenDCAE-c12/c12' - super(self.__class__, self).do_GET(param1, param2) - - def do_POST(self): - #Prepare POST response - logger.console('========') - logger.console(self.raw_requestline) - logger.console('========') - if re.search('/events/unauthenticated.PNF_READY', self.path) is not None: - global prh_ready - prh_ready = '{"event":{"correlationID":"NOKQTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}' - self.send_response(200) - -def run_server(HandlerClass, port, ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): - server_address = ('', port) - - HandlerClass.protocol_version = protocol - httpd = ServerClass(server_address, HandlerClass) - - global Httpd - Httpd = httpd - if HandlerClass is DMaaPHandler: - PrhVariables.DMaaPHTTPD = httpd - else: - PrhVariables.AAIHTTPD = httpd - - sa = httpd.socket.getsockname() - print "Serving HTTP on", sa[0], "port", sa[1], "..." - -def _main_ (HandlerClass, port, ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): - server_address = ('', port) - - HandlerClass.protocol_version = protocol - httpd = ServerClass(server_address, HandlerClass) - - sa = httpd.socket.getsockname() - print "Serving HTTP on", sa[0], "port", sa[1], "..." - httpd.serve_forever() - -if __name__ == '__main__': - _main_(DMaaPHandler, 3904) diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml b/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml index 7d1fcd5cf..e27d84516 100644 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml @@ -1,11 +1,11 @@ -version: '2' +version: '3' services: prh: image: nexus3.onap.org:10003/onap/org.onap.dcaegen2.services.prh.prh-app-server command: > --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222 --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222 - --aai.aaiClientConfiguration.aaiHostPortNumber=2222 + --aai.aaiClientConfiguration.aaiHostPortNumber=3333 --aai.aaiClientConfiguration.aaiProtocol=http entrypoint: - java @@ -17,13 +17,28 @@ services: - "8100:8100" - "8433:8433" container_name: prh + dmaap_simulator: build: - context: . + context: simulator + dockerfile: DMaaP_simulator args: - https_proxy=${HTTPS_PROXY} ports: - "2222:2222" container_name: dmaap_simulator depends_on: - - prh \ No newline at end of file + - prh + + aai_simulator: + build: + context: simulator + dockerfile: AAI_simulator + args: + - https_proxy=${HTTPS_PROXY} + ports: + - "3333:3333" + container_name: aai_simulator + depends_on: + - prh + \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json b/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json deleted file mode 100644 index 2351fa4ff..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json +++ /dev/null @@ -1 +0,0 @@ -{"event": {"commonEventHeader": {"sourceId":"QTFCOC540002E", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC540002E-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", "pnfVendorName":"Nokia", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"10.16.123.234", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC540002E", "pnfManufactureDate":1516406400}}} \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot b/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot deleted file mode 100644 index 1595cd4a4..000000000 --- a/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot +++ /dev/null @@ -1,61 +0,0 @@ -*** Settings *** -Documentation The main interface for interacting with PRH. It handles low level stuff like managing the http request library -Library PrhLibrary.py -Library RequestsLibrary - -*** Variables *** - -*** Keywords *** -PRH Suite Setup - [Documentation] Start DMaaP and AAI Mockup Server - ${ret}= Setup DMaaP Server - Should Be Equal As Strings ${ret} true - ${ret}= Setup AAI Server - Should Be Equal As Strings ${ret} true - -PRH Suite Shutdown - [Documentation] Shutdown DMaaP and AAI Mockup Server - ${ret}= Shutdown DMaap Server - Should Be Equal As Strings ${ret} true - ${ret}= Shutdown AAI Server - Should Be Equal As Strings ${ret} true - -Get event from DMaaP - [Arguments] ${ip} ${endpoint} - [Documentation] Get an event from DMaaP - ${url}= Catenate SEPARATOR= ${ip} ${endpoint} - Log Creating session ${url} - Create Session prh-d1 ${url} - ${resp}= Get Request prh-d1 ${url} - Log Received response from dcae ${resp.json()} - [Return] ${resp} - -Send patch from AAI - [Arguments] ${ip} ${endpoint} - [Documentation] Get patch from AAI - ${url}= Catenate SEPARATOR= ${ip} ${endpoint} - Log Creating session ${url} - Create Session prh-d1 ${url} - ${resp}= Patch Request prh-d1 ${url} - Log ${resp} - [Return] ${resp} - -Get json from AAI - [Arguments] ${ip} ${endpoint} - [Documentation] Get json from AAI - ${url}= Catenate SEPARATOR= ${ip} ${endpoint} - Log Creating session ${url} - Create Session prh-d1 ${url} - ${resp}= Get Request prh-d1 ${url} - Log Received response from dcae ${resp.json()} - [Return] ${resp} - -Post json to DMaaP - [Arguments] ${ip} ${endpoint} ${PNF_READY} - [Documentation] Get json from AAI - ${url}= Catenate SEPARATOR= ${ip} ${endpoint} - Log Creating session ${url} - Create Session prh-d1 ${url} - ${resp}= Post Request prh-d1 ${url} data=${PNF_READY} - Log ${resp} - [Return] ${resp} diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI.py b/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI.py new file mode 100644 index 000000000..f9d0ee07b --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI.py @@ -0,0 +1,56 @@ +import BaseHTTPServer +import re +import sys + +from robot.api import logger + +pnfs = 'Empty' + +class AAIHandler(BaseHTTPServer.BaseHTTPRequestHandler): + def do_PUT(self): + if re.search('/set_pnfs', self.path): + global pnfs + content_length = int(self.headers['Content-Length']) + pnfs = self.rfile.read(content_length) + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + + return + + def do_PATCH(self): + pnfs_name = '/aai/v12/network/pnfs/pnf/' + pnfs + if re.search(pnfs_name, self.path): + self.send_response(200) + self.end_headers() + + return + + def do_GET(self): + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + self.wfile.write('GET') + self.wfile.close() + + return + +def _main_ (HandlerClass = AAIHandler, + ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): + + if sys.argv[1:]: + port = int(sys.argv[1]) + else: + port = 3333 + + server_address = ('', port) + + HandlerClass.protocol_version = protocol + httpd = ServerClass(server_address, HandlerClass) + + sa = httpd.socket.getsockname() + print "Serving HTTP on", sa[0], "port", sa[1], "..." + httpd.serve_forever() + +if __name__ == '__main__': + _main_() diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI_simulator b/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI_simulator new file mode 100644 index 000000000..2d96d8925 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI_simulator @@ -0,0 +1,11 @@ +FROM python:2 + +ENV https_proxy "$https_proxy" + +ADD AAI.py / + +RUN pip install robotframework + +EXPOSE 3333 + +CMD [ "python", "./AAI.py" ] diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP.py b/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP.py new file mode 100644 index 000000000..af716fd06 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP.py @@ -0,0 +1,75 @@ +import BaseHTTPServer +import re +import sys + +from robot.api import logger + +posted_event_from_prh = 'Empty' +received_event_to_get_method = 'Empty' + +class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler): + def do_PUT(self): + if re.search('/set_get_event', self.path): + global received_event_to_get_method + content_length = int(self.headers['Content-Length']) + received_event_to_get_method = self.rfile.read(content_length) + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + + return + + def do_POST(self): + if re.search('/events/pnfReady', self.path): + global posted_event_from_prh + content_length = int(self.headers['Content-Length']) + posted_event_from_prh = self.rfile.read(content_length) + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + + return + + def do_GET(self): + if re.search('/events/unauthenticated.SEC_OTHER_OUTPUT', self.path): + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + self.wfile.write(received_event_to_get_method) + self.wfile.close() + elif re.search('/events/pnfReady', self.path): + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + self.wfile.write(posted_event_from_prh) + global posted_event_from_prh + posted_event_from_prh = 'Empty' + self.wfile.close() + else: + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + self.wfile.write('GET else') + self.wfile.close() + + return + +def _main_ (HandlerClass = DMaaPHandler, + ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): + + if sys.argv[1:]: + port = int(sys.argv[1]) + else: + port = 2222 + + server_address = ('', port) + + HandlerClass.protocol_version = protocol + httpd = ServerClass(server_address, HandlerClass) + + sa = httpd.socket.getsockname() + print "Serving HTTP on", sa[0], "port", sa[1], "..." + httpd.serve_forever() + +if __name__ == '__main__': + _main_() diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP_simulator b/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP_simulator new file mode 100644 index 000000000..4de65393d --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP_simulator @@ -0,0 +1,11 @@ +FROM python:2 + +ENV https_proxy "$https_proxy" + +ADD DMaaP.py / + +RUN pip install robotframework + +EXPOSE 2222 + +CMD [ "python", "./DMaaP.py" ] -- cgit 1.2.3-korg From 4b38677c15d69c7da3541e520034f95acb45fc91 Mon Sep 17 00:00:00 2001 From: Shankar Narayanan Date: Tue, 5 Jun 2018 09:58:09 -0400 Subject: update version for optf Update the version for optf repositories to 1.1.1 Issue-ID: OPTFRA-253 Change-Id: Id76f9b69972a4acf446e934e1529919749f7072b Signed-off-by: Shankar Narayanan --- version-manifest/src/main/resources/docker-manifest.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 4eb632719..2edf9c6cb 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -43,8 +43,8 @@ onap/multicloud/vio-vesagent,1.0.0 onap/music/cassandra_music,3.0.0 onap/music/music,latest onap/oom/kube2msb,latest -onap/optf-has,latest -onap/optf-osdf,latest +onap/optf-has,1.1.1 +onap/optf-osdf,1.1.1 onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.2.0 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3 -- cgit 1.2.3-korg From ff4f07c9813408c0b6eccd0b9ac17afa2abc1025 Mon Sep 17 00:00:00 2001 From: yangyan Date: Tue, 5 Jun 2018 12:13:53 +0800 Subject: Update manifest for VF-C Issue-ID: VFC-930 Change-Id: I836f7971f6bd20b156404f596c378ee7eede6368 Signed-off-by: yangyan Signed-off-by: Gary Wu --- .../src/main/resources/docker-manifest.csv | 35 +++++++++++----------- .../src/main/resources/java-manifest.csv | 30 ++++++++++--------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 2edf9c6cb..771945f1b 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -91,24 +91,23 @@ onap/sparky-be,1.2.1 onap/testsuite,1.2.1 onap/usecase-ui,latest onap/usecase-ui/usecase-ui-server,latest -onap/vfc/catalog,1.1.0-STAGING-latest -onap/vfc/emsdriver,1.1.0-STAGING-latest -onap/vfc/gvnfmdriver,1.1.0-STAGING-latest -onap/vfc/jujudriver,1.1.0-STAGING-latest -onap/vfc/multivimproxy,1.0.0-STAGING-latest -onap/vfc/nfvo/svnfm/huawei,1.1.0-STAGING-latest -onap/vfc/nfvo/svnfm/nokia,1.1.0-STAGING-latest -onap/vfc/nfvo/svnfm/nokiav2,1.1.0-STAGING-latest -onap/vfc/nslcm,1.1.0-STAGING-latest -onap/vfc/resmanagement,1.1.0-STAGING-latest -onap/vfc/vnflcm,1.1.0-STAGING-latest -onap/vfc/vnfmgr,1.1.0-STAGING-latest -onap/vfc/vnfres,1.1.0-STAGING-latest -onap/vfc/wfengine-activiti,latest -onap/vfc/wfengine-mgrservice,latest -onap/vfc/ztesdncdriver,1.1.0-STAGING-latest -onap/vfc/ztevmanagerdriver,1.0.3-STAGING-latest -onap/vfc/ztevnfmdriver,1.1.0-STAGING-latest +onap/vfc/catalog,1.1.0 +onap/vfc/emsdriver,1.1.0 +onap/vfc/gvnfmdriver,1.1.0 +onap/vfc/jujudriver,1.1.0 +onap/vfc/multivimproxy,1.0.0 +onap/vfc/nfvo/svnfm/huawei,1.1.0 +onap/vfc/nfvo/svnfm/nokia,1.1.0 +onap/vfc/nfvo/svnfm/nokiav2,1.1.0 +onap/vfc/nslcm,1.1.0 +onap/vfc/resmanagement,1.1.0 +onap/vfc/vnflcm,1.1.0 +onap/vfc/vnfmgr,1.1.0 +onap/vfc/vnfres,1.1.0 +onap/vfc/wfengine-activiti,1.1.0 +onap/vfc/wfengine-mgrservice,1.1.0 +onap/vfc/ztesdncdriver,1.1.0 +onap/vfc/ztevnfmdriver,1.1.0 onap/vid,2.0.0 onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.1.1 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index f6c2fdabc..bc3ec9f0a 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -221,20 +221,22 @@ org.onap.sdnc.northbound,vnfapi-provider,1.3.4 org.onap.sdnc.northbound,vnftools-provider,1.3.4 org.onap.usecase-ui,usecaseui-common,1.0.1 org.onap.usecase-ui.server,usecase-ui-server,1.0.1 -org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.0.1 -org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.0.1 -org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.0.1 -org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.0.2 -org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.0.1 -org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.0.0 -org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.0.1 -org.onap.vfc.nfvo.driver.vnfm.svnfm,vfcadaptor-deployment,1.0.1 -org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.0.0 -org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.0.2 -org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.0.2 -org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.0.0 -org.onap.vfc.nfvo.wfengine,activiti-extension,1.0.0 -org.onap.vfc.nfvo.wfengine,workflow-engine-mgr-service,1.0.0 +org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.1.0 +org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.1.0 +org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.1.0 +org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.1.0 +org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.1.0 +org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.1.0 +org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.1.0 +org.onap.vfc.nfvo.driver.vnfm.svnfm,vfcadaptor-deployment,1.1.0 +org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.1.0 +org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.1.0 +org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.1.0 +org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.1.0 +org.onap.vfc.nfvo.multivimproxy,vfc-nfvo-multivimproxy-deployment,1.0.0 +org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.1.0 +org.onap.vfc.nfvo.wfengine,activiti-extension,1.1.0 +org.onap.vfc.nfvo.wfengine,workflow-engine-mgr-service,1.1.0 org.onap.vnfsdk.refrepo,vnf-sdk-marketplace,1.1.2 org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-core-parent,1.1.1 org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-deployment,1.1.2 -- cgit 1.2.3-korg From c7931b9fdcbb8686be89153b5079e09cc3cff11c Mon Sep 17 00:00:00 2001 From: jmac Date: Tue, 5 Jun 2018 14:41:26 +0000 Subject: update sdnc adminportal to release version Change-Id: Iae7263cdc5e0ac46b102cd4c82b586be1db43256 Signed-off-by: jmac Issue-ID: INT-519 --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 2edf9c6cb..391764845 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -13,7 +13,7 @@ onap/aai-resources,1.2.1 onap/aai-traversal,1.2.1 onap/aai/esr-gui,latest onap/aai/esr-server,latest -onap/admportal-sdnc-image,1.3-STAGING-latest +onap/admportal-sdnc-image,1.3.4 onap/appc-cdt-image,1.3.0 onap/appc-image,1.3.0 onap/babel,1.2.0 -- cgit 1.2.3-korg From ca86676cacecfec5a63f888011737531b7da4033 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 5 Jun 2018 11:48:27 -0700 Subject: Update docker manifest for sniroemulator Change-Id: I3f335694fc16adb7226a440b4d05dbfb2f4a4046 Issue-ID: INT-504 Signed-off-by: Gary Wu --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 34581f1b0..b0e126a14 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -86,7 +86,7 @@ onap/sdnc-dmaap-listener-image,1.3.4 onap/sdnc-image,1.3.4 onap/sdnc-ueb-listener-image,1.3.4 onap/search-data-service,1.2.1 -onap/sniroemulator,latest +onap/sniroemulator,1.0.0 onap/sparky-be,1.2.1 onap/testsuite,1.2.1 onap/usecase-ui,latest -- cgit 1.2.3-korg From 2008dff861653a03dfe1deddf441e545b666c2d8 Mon Sep 17 00:00:00 2001 From: seshukm Date: Wed, 6 Jun 2018 03:03:15 +0800 Subject: update the docker manifest file Issue-ID: SO-601 Change-Id: Ia2e67dd05f9563d26e39a3fb7fbaf1450e363a0f Signed-off-by: seshukm --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 34581f1b0..80e5e20c3 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -113,4 +113,4 @@ onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.1.1 onap/vnfsdk/refrepo/postgres,1.1.1 onap/vnfsdk/vnftest,1.1.0 -openecomp/mso,1.2.1 +openecomp/mso,1.2.2 -- cgit 1.2.3-korg From c5c0385f555183bf6403a40f4af65d73fa412d65 Mon Sep 17 00:00:00 2001 From: seshukm Date: Wed, 6 Jun 2018 04:02:35 +0800 Subject: release artifacts bumped Issue-ID: SO-601 Change-Id: I987157fa19bad382f50cbc2d8362325c3369a495 Signed-off-by: seshukm --- .../src/main/resources/java-manifest.csv | 64 +++++++++++----------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index bc3ec9f0a..a4b611611 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -246,36 +246,36 @@ org.onap.vnfsdk.validation,csarvalidation-deployment,1.1.1 org.onap.vnfsdk.validation,validation,1.1.2 org.onap.vnfsdk.validation,validation-csar,1.1.2 org.onap.vnfsdk.ves-agent,evel_javalib2,1.1.0 -org.openecomp.so,MSOCommonBPMN,1.1.1 -org.openecomp.so,MSOCoreBPMN,1.1.1 -org.openecomp.so,MSOInfrastructureBPMN,1.1.1 -org.openecomp.so,MSORESTClient,1.1.1 -org.openecomp.so,common,1.1.1 -org.openecomp.so,mso-api-handler-common,1.1.1 -org.openecomp.so,mso-catalog-db,1.1.1 -org.openecomp.so,mso-requests-db,1.1.1 -org.openecomp.so,status-control,1.1.1 -org.openecomp.so.adapters,mso-adapter-utils,1.1.1 -org.openecomp.so.adapters,mso-adapters-rest-interface,1.1.1 -org.openecomp.so.adapters,mso-network-adapter-async-client,1.1.1 -org.openecomp.so.adapters,mso-vnf-adapter-async-client,1.1.1 -org.openecomp.so.libs.openstack-java-sdk,ceilometer-client,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,ceilometer-model,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,glance-client,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,glance-model,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,heat-client,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,heat-model,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,keystone-client,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,keystone-model,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,nova-client,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,nova-model,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,openstack-client,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,quantum-client,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,quantum-model,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,swift-client,1.1.0 -org.openecomp.so.libs.openstack-java-sdk,swift-model,1.1.0 -org.openecomp.so.libs.openstack-java-sdk.client-connectors,http-connector,1.1.0 -org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey-connector,1.1.0 -org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey2-connector,1.1.0 -org.openecomp.so.libs.openstack-java-sdk.client-connectors,resteasy-connector,1.1.0 +org.openecomp.so,MSOCommonBPMN,1.2.2 +org.openecomp.so,MSOCoreBPMN,1.2.2 +org.openecomp.so,MSOInfrastructureBPMN,1.2.2 +org.openecomp.so,MSORESTClient,1.2.2 +org.openecomp.so,common,1.2.2 +org.openecomp.so,mso-api-handler-common,1.2.2 +org.openecomp.so,mso-catalog-db,1.2.2 +org.openecomp.so,mso-requests-db,1.2.2 +org.openecomp.so,status-control,1.2.2 +org.openecomp.so.adapters,mso-adapter-utils,1.2.2 +org.openecomp.so.adapters,mso-adapters-rest-interface,1.2.2 +org.openecomp.so.adapters,mso-network-adapter-async-client,1.2.2 +org.openecomp.so.adapters,mso-vnf-adapter-async-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,ceilometer-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,ceilometer-model,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,glance-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,glance-model,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,heat-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,heat-model,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,keystone-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,keystone-model,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,nova-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,nova-model,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,openstack-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,quantum-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,quantum-model,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,swift-client,1.2.2 +org.openecomp.so.libs.openstack-java-sdk,swift-model,1.2.2 +org.openecomp.so.libs.openstack-java-sdk.client-connectors,http-connector,1.2.2 +org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey-connector,1.2.2 +org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey2-connector,1.2.2 +org.openecomp.so.libs.openstack-java-sdk.client-connectors,resteasy-connector,1.2.2 org.openecomp.vid,asdcclient,1.0.2 -- cgit 1.2.3-korg From ff946e73c96f3ba3188411a7b1692b62b9620363 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 5 Jun 2018 16:47:47 -0400 Subject: Update to latest versions Issue-ID: AAI-1204 Change-Id: Ia0997861a1964bc61bb7234253bc565006a78cb8 Signed-off-by: Jimmy Forsyth (cherry picked from commit 4c7d20e30fb2e5165b0d155c8d6de787662d467c) --- version-manifest/src/main/resources/docker-manifest.csv | 4 ++-- version-manifest/src/main/resources/java-manifest.csv | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 51ea1489d..a69abc050 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -9,8 +9,8 @@ onap/aaf/aaf_service,2.1.0-SNAPSHOT onap/aaf/authz-service,latest onap/aaf/sms,latest onap/aaf/smsquorumclient,latest -onap/aai-resources,1.2.1 -onap/aai-traversal,1.2.1 +onap/aai-resources,1.2.2 +onap/aai-traversal,1.2.2 onap/aai/esr-gui,latest onap/aai/esr-server,latest onap/admportal-sdnc-image,1.3.4 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index a4b611611..3a57bc880 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -33,14 +33,14 @@ org.onap.aai.aai-common,aai-utils,1.2.4 org.onap.aai.babel,babel,1.2.0 org.onap.aai.champ,champ,1.2.2 org.onap.aai.data-router,data-router,1.2.1 -org.onap.aai.esr-gui,aai-esr-gui,1.0.0 -org.onap.aai.esr-gui,common,1.0.0 -org.onap.aai.esr-gui,distribution,1.0.0 -org.onap.aai.esr-gui,integration,1.0.0 -org.onap.aai.esr-gui,portal,1.0.0 -org.onap.aai.esr-server,aai-esr-server,1.0.0 -org.onap.aai.esr-server,esr-manager,1.0.0 -org.onap.aai.esr-server,standalone,1.0.0 +org.onap.aai.esr-gui,aai-esr-gui,1.1.0 +org.onap.aai.esr-gui,common,1.1.0 +org.onap.aai.esr-gui,distribution,1.1.0 +org.onap.aai.esr-gui,integration,1.1.0 +org.onap.aai.esr-gui,portal,1.1.0 +org.onap.aai.esr-server,aai-esr-server,1.2.2 +org.onap.aai.esr-server,esr-manager,1.2.2 +org.onap.aai.esr-server,standalone,1.2.2 org.onap.aai.event-client,event-client,1.2.2 org.onap.aai.event-client,event-client-api,1.2.2 org.onap.aai.event-client,event-client-dmaap,1.2.2 -- cgit 1.2.3-korg From 2b086f88617a3c23302f4cab84fb7dc5b40bc5a8 Mon Sep 17 00:00:00 2001 From: Dominic Lunanuova Date: Tue, 5 Jun 2018 21:06:45 +0000 Subject: Update docker manifest for buscontroller Change-Id: I590bfdf1ac8f2e7cd667efa4c7f234d03ce73d9f Signed-off-by: Dominic Lunanuova Issue-ID: INT-520 --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 51ea1489d..71f181a14 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -24,7 +24,7 @@ onap/champ,1.2.3 onap/clamp,2.0.2 onap/cli,2.0.2 onap/data-router,1.2.2 -onap/dmaap/buscontroller,latest +onap/dmaap/buscontroller,1.0.12 onap/dmaap/dmaap-mr,1.1.4 onap/externalapi/nbi,2.0.0 onap/gizmo,1.2.1 -- cgit 1.2.3-korg From b51816b20a63c50ba5bd2c64ff689d2fe955585c Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 5 Jun 2018 17:07:47 -0400 Subject: Update to latest java versions Issue-ID: AAI-1204 Change-Id: I94f382eec0224f1eedcb9b02161b7453128aae41 Signed-off-by: Jimmy Forsyth (cherry picked from commit 95604de32a8855e041677b2adbe935e717d6d1de) --- version-manifest/src/main/resources/java-manifest.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 3a57bc880..2a79b1bcd 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -51,13 +51,13 @@ org.onap.aai.logging-service,eelf-logging,1.2.2 org.onap.aai.logging-service,logging-api,1.2.2 org.onap.aai.logging-service,logging-service,1.2.2 org.onap.aai.model-loader,model-loader,1.2.0 -org.onap.aai.resources,aai-resources,1.2.0 -org.onap.aai.resources,resources,1.2.0 +org.onap.aai.resources,aai-resources,1.2.2 +org.onap.aai.resources,resources,1.2.2 org.onap.aai.router-core,router-core,1.2.1 org.onap.aai.sparky-be,sparky-be,1.2.0 org.onap.aai.sparky-fe,sparky-fe,1.2.1 -org.onap.aai.traversal,aai-traversal,1.2.0 -org.onap.aai.traversal,traversal,1.2.0 +org.onap.aai.traversal,aai-traversal,1.2.2 +org.onap.aai.traversal,traversal,1.2.2 org.onap.appc,appc-aai-client-provider,1.3.0 org.onap.appc,appc-ansible-adapter-bundle,1.3.0 org.onap.appc,appc-artifact-handler-provider,1.3.0 -- cgit 1.2.3-korg From b10fa919d49092f36be599541973a1cb64c10ee3 Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Tue, 5 Jun 2018 21:05:11 +0000 Subject: Upadte aaf docker version in manifest Updated to latest version 2.1.1 Issue-ID: AAF-349 Change-Id: Ic7bc3079fab77c51fc748b189a69757a0bc4e6fc Signed-off-by: Sai Gandham --- version-manifest/src/main/resources/docker-manifest.csv | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 51ea1489d..790d67eae 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -1,11 +1,11 @@ image,tag -onap/aaf/aaf_cm,2.1.0-SNAPSHOT -onap/aaf/aaf_fs,2.1.0-SNAPSHOT -onap/aaf/aaf_gui,2.1.0-SNAPSHOT -onap/aaf/aaf_hello,2.1.0-SNAPSHOT -onap/aaf/aaf_locate,2.1.0-SNAPSHOT -onap/aaf/aaf_oauth,2.1.0-SNAPSHOT -onap/aaf/aaf_service,2.1.0-SNAPSHOT +onap/aaf/aaf_cm,2.1.1 +onap/aaf/aaf_fs,2.1.1 +onap/aaf/aaf_gui,2.1.1 +onap/aaf/aaf_hello,2.1.1 +onap/aaf/aaf_locate,2.1.1 +onap/aaf/aaf_oauth,2.1.1 +onap/aaf/aaf_service,2.1.1 onap/aaf/authz-service,latest onap/aaf/sms,latest onap/aaf/smsquorumclient,latest -- cgit 1.2.3-korg From 19fd1bbf63c90ccc965f576c4021a00708165d40 Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Tue, 5 Jun 2018 22:16:07 +0000 Subject: remove aaf authz-service latest in manifest removed authz-service:latest from manifest as the new version of authz-service is already available for Beijing Issue-ID: AAF-349 Change-Id: I1866f2032e258338b510078d13b3b83c74486a7d Signed-off-by: Sai Gandham --- version-manifest/src/main/resources/docker-manifest.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 540978d25..b3e6b8a47 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -6,7 +6,6 @@ onap/aaf/aaf_hello,2.1.1 onap/aaf/aaf_locate,2.1.1 onap/aaf/aaf_oauth,2.1.1 onap/aaf/aaf_service,2.1.1 -onap/aaf/authz-service,latest onap/aaf/sms,latest onap/aaf/smsquorumclient,latest onap/aai-resources,1.2.2 -- cgit 1.2.3-korg From 276d5a438b43db9659ad9f4553d827a90c72f9be Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 5 Jun 2018 11:26:44 -0700 Subject: Increase to 11 k8s VMs for stability Issue-ID: INT-381 Change-Id: I864cf1f80c2b54fca200cd7cdb5d97e17d6f4706 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/onap-oom.yaml | 76 ++++++++++++++++++++++ .../heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 1 + 2 files changed, 77 insertions(+) diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 9cf44e41c..1a217c221 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -149,6 +149,8 @@ resources: get_attr: [k8s_7_floating_ip, floating_ip_address], get_attr: [k8s_8_floating_ip, floating_ip_address], get_attr: [k8s_9_floating_ip, floating_ip_address], + get_attr: [k8s_10_floating_ip, floating_ip_address], + get_attr: [k8s_11_floating_ip, floating_ip_address], ] k8s_1_private_port: type: OS::Neutron::Port @@ -447,6 +449,72 @@ resources: template: get_file: k8s_vm_entrypoint.sh + k8s_10_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_network } + fixed_ips: [{"subnet": { get_resource: oam_subnet }}] + security_groups: + - { get_resource: onap_sg } + + k8s_10_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_10_private_port } + + k8s_10_vm: + type: OS::Nova::Server + properties: + name: k8s_10 + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: onap_key + networks: + - port: { get_resource: k8s_10_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + template: + get_file: k8s_vm_entrypoint.sh + + k8s_11_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_network } + fixed_ips: [{"subnet": { get_resource: oam_subnet }}] + security_groups: + - { get_resource: onap_sg } + + k8s_11_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_11_private_port } + + k8s_11_vm: + type: OS::Nova::Server + properties: + name: k8s_11 + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: onap_key + networks: + - port: { get_resource: k8s_11_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + template: + get_file: k8s_vm_entrypoint.sh + outputs: rancher_vm_ip: description: The IP address of the rancher instance @@ -488,3 +556,11 @@ outputs: description: The IP address of the k8s_9 instance value: { get_attr: [k8s_9_floating_ip, floating_ip_address] } + k8s_10_vm_ip: + description: The IP address of the k8s_10 instance + value: { get_attr: [k8s_10_floating_ip, floating_ip_address] } + + k8s_11_vm_ip: + description: The IP address of the k8s_11 instance + value: { get_attr: [k8s_11_floating_ip, floating_ip_address] } + diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index 1ab0de762..23f969c6b 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -52,6 +52,7 @@ cat < Date: Tue, 5 Jun 2018 20:33:45 -0400 Subject: Update the Portal's docker version Issue-ID: CIMAN-132 Change-Id: Ic1ad1b0f17fba19815a3f4b749c9aeaa12e539c8 Signed-off-by: Manoop Talasila --- version-manifest/src/main/resources/docker-manifest.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index b3e6b8a47..2c63dc505 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -62,10 +62,10 @@ onap/org.onap.dcaegen2.services.heartbeat,latest onap/org.onap.dcaegen2.services.prh.prh-app-server,latest onap/policy-drools,1.2.3 onap/policy-pe,1.2.3 -onap/portal-app,v2.2.0 -onap/portal-db,v2.2.0 -onap/portal-sdk,v2.2.0 -onap/portal-wms,v2.2.0 +onap/portal-app,2.2.0 +onap/portal-db,2.2.0 +onap/portal-sdk,2.2.0 +onap/portal-wms,2.2.0 onap/sdc-api-tests,1.3-STAGING-latest onap/sdc-backend,1.3-STAGING-latest onap/sdc-backend-init,1.3-STAGING-latest -- cgit 1.2.3-korg From 1b3973eee58165874acedce0fc7a429824a526e6 Mon Sep 17 00:00:00 2001 From: Gildas Lanilis Date: Tue, 5 Jun 2018 17:37:57 -0700 Subject: Remove unnecessary docker image No need to declare modeling/javatocachecker, b/c the lib is embedded within VFC. Change-Id: I07b305a279ae8cbf05fb7ee673e69f7994a48bf4 Issue-ID: INT-523 Signed-off-by: Gildas Lanilis --- version-manifest/src/main/resources/docker-manifest.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index b3e6b8a47..c9f1a712d 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -30,7 +30,6 @@ onap/gizmo,1.2.1 onap/holmes/engine-management,1.1.0 onap/holmes/rule-management,1.1.0 onap/model-loader,1.2.1 -onap/modeling/javatoscachecker,latest onap/msb/msb_apigateway,1.1.0 onap/msb/msb_discovery,1.1.0 onap/multicloud/framework,1.1.2-STAGING -- cgit 1.2.3-korg From c033a9ef099ca7d3220b6b1e86843c76a66887e6 Mon Sep 17 00:00:00 2001 From: Gildas Lanilis Date: Tue, 5 Jun 2018 18:32:49 -0700 Subject: Update version for aai-ers docker manifest Update to version 1.1.0 Change-Id: Ia4a9e42ea7598c1151086a9a3b64c1d269700cfc Issue-ID: INT-524 Signed-off-by: Gildas Lanilis (cherry picked from commit 410327d0a3d4b8b5c489438aa325ce46db298ee2) --- version-manifest/src/main/resources/docker-manifest.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index a0481cf2d..c6114c657 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -10,8 +10,8 @@ onap/aaf/sms,latest onap/aaf/smsquorumclient,latest onap/aai-resources,1.2.2 onap/aai-traversal,1.2.2 -onap/aai/esr-gui,latest -onap/aai/esr-server,latest +onap/aai/esr-gui,1.1.0 +onap/aai/esr-server,1.1.0 onap/admportal-sdnc-image,1.3.4 onap/appc-cdt-image,1.3.0 onap/appc-image,1.3.0 -- cgit 1.2.3-korg From 27522e34021b04f430e1cdc079fe6fa817fe013d Mon Sep 17 00:00:00 2001 From: "Sonsino, Ofir (os0695)" Date: Wed, 6 Jun 2018 11:34:30 +0300 Subject: Remove VID asdcclient from manifest Change-Id: I11c8713c938bd1af6d92c81f2280a2b7f84c675d Issue-ID: VID-242 Signed-off-by: Sonsino, Ofir (os0695) --- version-manifest/src/main/resources/java-manifest.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 2a79b1bcd..af1c6b56e 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -278,4 +278,3 @@ org.openecomp.so.libs.openstack-java-sdk.client-connectors,http-connector,1.2.2 org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey-connector,1.2.2 org.openecomp.so.libs.openstack-java-sdk.client-connectors,jersey2-connector,1.2.2 org.openecomp.so.libs.openstack-java-sdk.client-connectors,resteasy-connector,1.2.2 -org.openecomp.vid,asdcclient,1.0.2 -- cgit 1.2.3-korg From 2da2e8400bbd6eb62bac7865697961bf143a8fe3 Mon Sep 17 00:00:00 2001 From: xinhuili Date: Wed, 6 Jun 2018 07:28:03 +0800 Subject: Change version number in docker manifest file This patch is to change the version Change-Id: Id4d3e3dc97b0d0fcfb5442d3083718f386d0abe5 Issue-ID: MULTICLOUD-241 Signed-off-by: Xinhui Li --- test/csit/plans/multicloud-ocata/functionality1/setup.sh | 2 +- test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh | 2 +- version-manifest/src/main/resources/docker-manifest.csv | 10 +++++----- version-manifest/src/main/resources/java-manifest.csv | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/csit/plans/multicloud-ocata/functionality1/setup.sh b/test/csit/plans/multicloud-ocata/functionality1/setup.sh index b674fa61d..3cba68136 100644 --- a/test/csit/plans/multicloud-ocata/functionality1/setup.sh +++ b/test/csit/plans/multicloud-ocata/functionality1/setup.sh @@ -14,7 +14,7 @@ pushd ${SCRIPTS} # start multicloud-ocata -./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack-ocata:latest multicloud-ocata +./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack/openstack-ocata:latest multicloud-ocata SERVICE_IP=$(./get-instance-ip.sh multicloud-ocata) SERVICE_PORT=9006 popd diff --git a/test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh b/test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh index b98e2de8a..d17bec124 100644 --- a/test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh +++ b/test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh @@ -43,7 +43,7 @@ start_simulator keystone 5000 start_simulator aai 8443 # start multicloud-ocata -./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack-ocata multicloud-ocata "-t -e AAI_SERVICE_URL=http://aai:8080/aai -e no_proxy=$no_proxy -p 9006:9006" +./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack/openstack-ocata multicloud-ocata "-t -e AAI_SERVICE_URL=http://aai:8080/aai -e no_proxy=$no_proxy -p 9006:9006" SERVICE_IP=$(./get-instance-ip.sh multicloud-ocata) SERVICE_PORT=9006 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index b3e6b8a47..84ce99a8b 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -33,11 +33,11 @@ onap/model-loader,1.2.1 onap/modeling/javatoscachecker,latest onap/msb/msb_apigateway,1.1.0 onap/msb/msb_discovery,1.1.0 -onap/multicloud/framework,1.1.2-STAGING -onap/multicloud/openstack-newton,1.1.2-SNAPSHOT -onap/multicloud/openstack-ocata,1.1.2-SNAPSHOT -onap/multicloud/openstack-windriver,1.1.2-SNAPSHOT -onap/multicloud/vio,1.1.2-STAGING +onap/multicloud/framework,1.1.2 +onap/multicloud/openstack-newton,1.1.2 +onap/multicloud/openstack-windriver,1.1.2 +onap/multicloud/openstack/openstack-ocata,1.1.2 +onap/multicloud/vio,1.1.2 onap/multicloud/vio-vesagent,1.0.0 onap/music/cassandra_music,3.0.0 onap/music/music,latest diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 2a79b1bcd..361c512b0 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -194,12 +194,12 @@ org.onap.modeling.toscaparsers,kwalify,1.0.0 org.onap.modeling.toscaparsers.nfvparser,modeling-toscaparsers-nfvparser,1.0.0 org.onap.msb.java-sdk,msb-java-sdk,1.1.1 org.onap.msb.swagger-sdk,swagger-sdk,1.1.0 -org.onap.multicloud.framework,multivimbroker,1.0.0 -org.onap.multicloud.openstack,newton,1.0.0 -org.onap.multicloud.openstack,ocata,1.0.0 -org.onap.multicloud.openstack,windriver,1.0.0 +org.onap.multicloud.framework,multivimbroker,1.1.2 +org.onap.multicloud.openstack,newton,1.1.2 +org.onap.multicloud.openstack,ocata,1.1.2 +org.onap.multicloud.openstack,windriver,1.1.2 org.onap.multicloud.openstack.vmware,vesagent,1.0.0 -org.onap.multicloud.openstack.vmware,vio,1.0.0 +org.onap.multicloud.openstack.vmware,vio,1.1.2 org.onap.oparent,oparent,1.1.1 org.onap.policy.common,common-modules,1.2.3 org.onap.policy.drools-applications,drools-pdp-apps,1.2.3 -- cgit 1.2.3-korg From 538ca58886e381ef93e258f884a49b732a5203ba Mon Sep 17 00:00:00 2001 From: zhangab Date: Wed, 6 Jun 2018 13:38:11 +0800 Subject: update version for usecase-ui docker manifest Change-Id: Ia719d92aa90bd7a2e82b82d8a1f348acc4640fd3 Issue-ID: USECASEUI-125 Signed-off-by: zhangab (cherry picked from commit 015ea2073ddee3dbf336485cef7d62aa2291c3a8) --- version-manifest/src/main/resources/docker-manifest.csv | 4 ++-- version-manifest/src/main/resources/java-manifest.csv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 98fd480a0..5ad21110f 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -87,8 +87,8 @@ onap/search-data-service,1.2.1 onap/sniroemulator,1.0.0 onap/sparky-be,1.2.1 onap/testsuite,1.2.1 -onap/usecase-ui,latest -onap/usecase-ui/usecase-ui-server,latest +onap/usecase-ui,1.1.1 +onap/usecase-ui/usecase-ui-server,1.1.1 onap/vfc/catalog,1.1.0 onap/vfc/emsdriver,1.1.0 onap/vfc/gvnfmdriver,1.1.0 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index a29d46019..3e32ad704 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -219,8 +219,8 @@ org.onap.sdc.sdc-workflow-designer,sdc-workflow-designer,1.0.0 org.onap.sdnc.northbound,generic-resource-api.provider,1.3.4 org.onap.sdnc.northbound,vnfapi-provider,1.3.4 org.onap.sdnc.northbound,vnftools-provider,1.3.4 -org.onap.usecase-ui,usecaseui-common,1.0.1 -org.onap.usecase-ui.server,usecase-ui-server,1.0.1 +org.onap.usecase-ui,usecaseui-common,1.1.0 +org.onap.usecase-ui.server,usecase-ui-server,1.1.0 org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.1.0 org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.1.0 org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.1.0 -- cgit 1.2.3-korg From 6b35cc2e7d871a7252a2fffe810a97ff6970bd85 Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Wed, 6 Jun 2018 12:46:04 +0000 Subject: Update aaf version in java manifest Latest aaf version 2.1.1 artifacts are now released into nexus and Update this version chnage in java manifest. Issue-ID: AAF-349 Change-Id: I7cb62377298caf366470bc6636e706892515a579 Signed-off-by: Sai Gandham Signed-off-by: Gary Wu --- .../src/main/resources/java-manifest.csv | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 3e32ad704..61e1c07ce 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -1,27 +1,28 @@ groupId,artifactId,version -org.onap.aaf.authz,aaf-auth-batch,2.1.0 -org.onap.aaf.authz,aaf-auth-cass,2.1.0 -org.onap.aaf.authz,aaf-auth-certman,2.1.0 -org.onap.aaf.authz,aaf-auth-client,2.1.0 -org.onap.aaf.authz,aaf-auth-cmd,2.1.0 -org.onap.aaf.authz,aaf-auth-core,2.1.0 -org.onap.aaf.authz,aaf-auth-deforg,2.1.0 -org.onap.aaf.authz,aaf-auth-fs,2.1.0 -org.onap.aaf.authz,aaf-auth-gui,2.1.0 -org.onap.aaf.authz,aaf-auth-hello,2.1.0 -org.onap.aaf.authz,aaf-auth-locate,2.1.0 -org.onap.aaf.authz,aaf-auth-oauth,2.1.0 -org.onap.aaf.authz,aaf-auth-service,2.1.0 -org.onap.aaf.authz,aaf-cadi-aaf,2.1.0 -org.onap.aaf.authz,aaf-cadi-cass,2.1.0 -org.onap.aaf.authz,aaf-cadi-client,2.1.0 -org.onap.aaf.authz,aaf-cadi-core,2.1.0 -org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.0 -org.onap.aaf.authz,aaf-cadi-shiro,2.1.0 -org.onap.aaf.authz,aaf-misc-env,2.1.0 -org.onap.aaf.authz,aaf-misc-log4j,2.1.0 -org.onap.aaf.authz,aaf-misc-rosetta,2.1.0 -org.onap.aaf.authz,aaf-misc-xgen,2.1.0 +org.onap.aaf.authz,aaf-auth-batch,2.1.1 +org.onap.aaf.authz,aaf-auth-cass,2.1.1 +org.onap.aaf.authz,aaf-auth-certman,2.1.1 +org.onap.aaf.authz,aaf-auth-client,2.1.1 +org.onap.aaf.authz,aaf-auth-cmd,2.1.1 +org.onap.aaf.authz,aaf-auth-core,2.1.1 +org.onap.aaf.authz,aaf-auth-deforg,2.1.1 +org.onap.aaf.authz,aaf-auth-fs,2.1.1 +org.onap.aaf.authz,aaf-auth-gui,2.1.1 +org.onap.aaf.authz,aaf-auth-hello,2.1.1 +org.onap.aaf.authz,aaf-auth-locate,2.1.1 +org.onap.aaf.authz,aaf-auth-oauth,2.1.1 +org.onap.aaf.authz,aaf-auth-service,2.1.1 +org.onap.aaf.authz,aaf-cadi-aaf,2.1.1 +org.onap.aaf.authz,aaf-cadi-cass,2.1.1 +org.onap.aaf.authz,aaf-cadi-client,2.1.1 +org.onap.aaf.authz,aaf-cadi-core,2.1.1 +org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.1 +org.onap.aaf.authz,aaf-cadi-shiro,2.1.1 +org.onap.aaf.authz,aaf-misc-env,2.1.1 +org.onap.aaf.authz,aaf-misc-log4j,2.1.1 +org.onap.aaf.authz,aaf-misc-rosetta,2.1.1 +org.onap.aaf.authz,aaf-misc-xgen,2.1.1 +org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.1 org.onap.aai,rest-client,1.2.1 org.onap.aai,search-data-service,1.2.0 org.onap.aai.aai-common,aai-annotations,1.2.4 -- cgit 1.2.3-korg From e2a8488c47323f5b3ee87a36a72c3e45d73cd3b2 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Tue, 5 Jun 2018 22:19:16 -0400 Subject: Remove docker tags for unreleased components Issue-ID: DCAEGEN2-499 Change-Id: I89c382559ba2a8210011de836f33b7002599c4e2 Signed-off-by: Lusheng Ji (cherry picked from commit d66f63d14c8dc651d8a759d0ae126e3c9a9d171c) --- version-manifest/src/main/resources/docker-manifest.csv | 2 -- 1 file changed, 2 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 5ad21110f..17cd3a37d 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -57,8 +57,6 @@ onap/org.onap.dcaegen2.platform.deployment-handler,2.1.5 onap/org.onap.dcaegen2.platform.inventory-api,3.0.1 onap/org.onap.dcaegen2.platform.policy-handler,2.4.5 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4 -onap/org.onap.dcaegen2.services.heartbeat,latest -onap/org.onap.dcaegen2.services.prh.prh-app-server,latest onap/policy-drools,1.2.3 onap/policy-pe,1.2.3 onap/portal-app,2.2.0 -- cgit 1.2.3-korg From 8ec8e08399b6e0c001a0ed9dd82664be315bdcbf Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Wed, 6 Jun 2018 10:13:09 -0700 Subject: Adding docker versions for sms The docker images on nexus are now tagged with 2.0.0. Updating the manifest accordingly Issue-ID: AAF-330 Change-Id: Ic80763857c5c4be4c041a55cf10a5275dfd174d8 Signed-off-by: Kiran Kamineni --- version-manifest/src/main/resources/docker-manifest.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 17cd3a37d..f5817afac 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -6,8 +6,8 @@ onap/aaf/aaf_hello,2.1.1 onap/aaf/aaf_locate,2.1.1 onap/aaf/aaf_oauth,2.1.1 onap/aaf/aaf_service,2.1.1 -onap/aaf/sms,latest -onap/aaf/smsquorumclient,latest +onap/aaf/sms,2.0.0 +onap/aaf/smsquorumclient,2.0.0 onap/aai-resources,1.2.2 onap/aai-traversal,1.2.2 onap/aai/esr-gui,1.1.0 -- cgit 1.2.3-korg From 783526e4f9ff5e789772e01b39ac14179d2c8553 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 6 Jun 2018 11:32:29 -0700 Subject: Release kube2msb:1.1.0. Change-Id: Ie70a20864def0801ab5656415fb657f256ccc92d Issue-ID: INT-504 Signed-off-by: Gary Wu --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index f5817afac..a8f84ea0a 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -40,7 +40,7 @@ onap/multicloud/vio,1.1.2 onap/multicloud/vio-vesagent,1.0.0 onap/music/cassandra_music,3.0.0 onap/music/music,latest -onap/oom/kube2msb,latest +onap/oom/kube2msb,1.1.0 onap/optf-has,1.1.1 onap/optf-osdf,1.1.1 onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0 -- cgit 1.2.3-korg From 3c9a8655604a913eb881c4a459102259d9e6fa71 Mon Sep 17 00:00:00 2001 From: "Nelson,Thomas(tn1381)(arthurdent3)" Date: Wed, 6 Jun 2018 16:03:29 -0400 Subject: Update docker information for MUSIC Update version looks like 2.5.11 is not released yet Change-Id: Ie127909b7bf12f1734d9c7053cd536b0c0388494 Issue-ID: MUSIC-79 Signed-off-by: Nelson,Thomas(tn1381)(arthurdent3) --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index a8f84ea0a..57bf2fc90 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -39,7 +39,7 @@ onap/multicloud/openstack/openstack-ocata,1.1.2 onap/multicloud/vio,1.1.2 onap/multicloud/vio-vesagent,1.0.0 onap/music/cassandra_music,3.0.0 -onap/music/music,latest +onap/music/music,2.5.3 onap/oom/kube2msb,1.1.0 onap/optf-has,1.1.1 onap/optf-osdf,1.1.1 -- cgit 1.2.3-korg From d443ad7865e5d4c2b802d8504475f1360c2d03d5 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 6 Jun 2018 13:37:17 -0700 Subject: Removed openstack/ from openstack-ocata image name Change-Id: Icd269d737b72471e970577156bd6f9429989bff4 Issue-ID: INT-504 Signed-off-by: Gary Wu (cherry picked from commit 45c14f022765d97c9e8e11bf5493167c681d1d17) --- version-manifest/src/main/resources/docker-manifest.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 57bf2fc90..dc612f538 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -34,8 +34,8 @@ onap/msb/msb_apigateway,1.1.0 onap/msb/msb_discovery,1.1.0 onap/multicloud/framework,1.1.2 onap/multicloud/openstack-newton,1.1.2 +onap/multicloud/openstack-ocata,1.1.2 onap/multicloud/openstack-windriver,1.1.2 -onap/multicloud/openstack/openstack-ocata,1.1.2 onap/multicloud/vio,1.1.2 onap/multicloud/vio-vesagent,1.0.0 onap/music/cassandra_music,3.0.0 -- cgit 1.2.3-korg From 2f55cbd70dbb896ce181ad738a1d35a6761d4d35 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 6 Jun 2018 14:52:29 -0700 Subject: Allow only released docker images in the manifest Change-Id: I8ebc0e6a8b923a4b9c81403ade7248a4396b179e Issue-ID: INT-504 Signed-off-by: Gary Wu --- version-manifest/pom.xml | 2 +- .../src/main/resources/docker-manifest-staging.csv | 112 +++++++++++++++++++++ .../src/main/resources/docker-manifest.csv | 26 ++--- .../src/main/scripts/check-docker-manifest.sh | 12 +-- 4 files changed, 128 insertions(+), 24 deletions(-) create mode 100644 version-manifest/src/main/resources/docker-manifest-staging.csv diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml index daa957ed9..89fb1b170 100644 --- a/version-manifest/pom.xml +++ b/version-manifest/pom.xml @@ -122,7 +122,7 @@ - check-docker-images-exist + check-docker-images-released validate exec diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv new file mode 100644 index 000000000..dc612f538 --- /dev/null +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -0,0 +1,112 @@ +image,tag +onap/aaf/aaf_cm,2.1.1 +onap/aaf/aaf_fs,2.1.1 +onap/aaf/aaf_gui,2.1.1 +onap/aaf/aaf_hello,2.1.1 +onap/aaf/aaf_locate,2.1.1 +onap/aaf/aaf_oauth,2.1.1 +onap/aaf/aaf_service,2.1.1 +onap/aaf/sms,2.0.0 +onap/aaf/smsquorumclient,2.0.0 +onap/aai-resources,1.2.2 +onap/aai-traversal,1.2.2 +onap/aai/esr-gui,1.1.0 +onap/aai/esr-server,1.1.0 +onap/admportal-sdnc-image,1.3.4 +onap/appc-cdt-image,1.3.0 +onap/appc-image,1.3.0 +onap/babel,1.2.0 +onap/ccsdk-dgbuilder-image,0.2.4 +onap/ccsdk-odl-image,0.2.4 +onap/ccsdk-odlsli-image,0.2.4 +onap/champ,1.2.3 +onap/clamp,2.0.2 +onap/cli,2.0.2 +onap/data-router,1.2.2 +onap/dmaap/buscontroller,1.0.12 +onap/dmaap/dmaap-mr,1.1.4 +onap/externalapi/nbi,2.0.0 +onap/gizmo,1.2.1 +onap/holmes/engine-management,1.1.0 +onap/holmes/rule-management,1.1.0 +onap/model-loader,1.2.1 +onap/msb/msb_apigateway,1.1.0 +onap/msb/msb_discovery,1.1.0 +onap/multicloud/framework,1.1.2 +onap/multicloud/openstack-newton,1.1.2 +onap/multicloud/openstack-ocata,1.1.2 +onap/multicloud/openstack-windriver,1.1.2 +onap/multicloud/vio,1.1.2 +onap/multicloud/vio-vesagent,1.0.0 +onap/music/cassandra_music,3.0.0 +onap/music/music,2.5.3 +onap/oom/kube2msb,1.1.0 +onap/optf-has,1.1.1 +onap/optf-osdf,1.1.1 +onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0 +onap/org.onap.dcaegen2.collectors.ves.vescollector,1.2.0 +onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3 +onap/org.onap.dcaegen2.deployments.cm-container,1.3.0 +onap/org.onap.dcaegen2.deployments.healthcheck-container,1.1.0 +onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.1.11 +onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0 +onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0 +onap/org.onap.dcaegen2.platform.cdapbroker,4.1.0 +onap/org.onap.dcaegen2.platform.configbinding,2.1.5 +onap/org.onap.dcaegen2.platform.deployment-handler,2.1.5 +onap/org.onap.dcaegen2.platform.inventory-api,3.0.1 +onap/org.onap.dcaegen2.platform.policy-handler,2.4.5 +onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4 +onap/policy-drools,1.2.3 +onap/policy-pe,1.2.3 +onap/portal-app,2.2.0 +onap/portal-db,2.2.0 +onap/portal-sdk,2.2.0 +onap/portal-wms,2.2.0 +onap/sdc-api-tests,1.3-STAGING-latest +onap/sdc-backend,1.3-STAGING-latest +onap/sdc-backend-init,1.3-STAGING-latest +onap/sdc-cassandra,1.3-STAGING-latest +onap/sdc-cassandra-init,1.3-STAGING-latest +onap/sdc-elasticsearch,1.3-STAGING-latest +onap/sdc-frontend,1.3-STAGING-latest +onap/sdc-init-elasticsearch,1.3-STAGING-latest +onap/sdc-kibana,1.3-STAGING-latest +onap/sdc-onboard-backend,1.3-STAGING-latest +onap/sdc-onboard-cassandra-init,1.3-STAGING-latest +onap/sdc-simulator,1.3-STAGING-latest +onap/sdc-ui-tests,1.3-STAGING-latest +onap/sdc/sdc-workflow-designer,1.1.0 +onap/sdnc-ansible-server-image,1.3.4 +onap/sdnc-dmaap-listener-image,1.3.4 +onap/sdnc-image,1.3.4 +onap/sdnc-ueb-listener-image,1.3.4 +onap/search-data-service,1.2.1 +onap/sniroemulator,1.0.0 +onap/sparky-be,1.2.1 +onap/testsuite,1.2.1 +onap/usecase-ui,1.1.1 +onap/usecase-ui/usecase-ui-server,1.1.1 +onap/vfc/catalog,1.1.0 +onap/vfc/emsdriver,1.1.0 +onap/vfc/gvnfmdriver,1.1.0 +onap/vfc/jujudriver,1.1.0 +onap/vfc/multivimproxy,1.0.0 +onap/vfc/nfvo/svnfm/huawei,1.1.0 +onap/vfc/nfvo/svnfm/nokia,1.1.0 +onap/vfc/nfvo/svnfm/nokiav2,1.1.0 +onap/vfc/nslcm,1.1.0 +onap/vfc/resmanagement,1.1.0 +onap/vfc/vnflcm,1.1.0 +onap/vfc/vnfmgr,1.1.0 +onap/vfc/vnfres,1.1.0 +onap/vfc/wfengine-activiti,1.1.0 +onap/vfc/wfengine-mgrservice,1.1.0 +onap/vfc/ztesdncdriver,1.1.0 +onap/vfc/ztevnfmdriver,1.1.0 +onap/vid,2.0.0 +onap/vnfsdk/ice,1.1.0 +onap/vnfsdk/refrepo,1.1.1 +onap/vnfsdk/refrepo/postgres,1.1.1 +onap/vnfsdk/vnftest,1.1.0 +openecomp/mso,1.2.2 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index dc612f538..da87af4c3 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -63,19 +63,19 @@ onap/portal-app,2.2.0 onap/portal-db,2.2.0 onap/portal-sdk,2.2.0 onap/portal-wms,2.2.0 -onap/sdc-api-tests,1.3-STAGING-latest -onap/sdc-backend,1.3-STAGING-latest -onap/sdc-backend-init,1.3-STAGING-latest -onap/sdc-cassandra,1.3-STAGING-latest -onap/sdc-cassandra-init,1.3-STAGING-latest -onap/sdc-elasticsearch,1.3-STAGING-latest -onap/sdc-frontend,1.3-STAGING-latest -onap/sdc-init-elasticsearch,1.3-STAGING-latest -onap/sdc-kibana,1.3-STAGING-latest -onap/sdc-onboard-backend,1.3-STAGING-latest -onap/sdc-onboard-cassandra-init,1.3-STAGING-latest -onap/sdc-simulator,1.3-STAGING-latest -onap/sdc-ui-tests,1.3-STAGING-latest +onap/sdc-api-tests,1.2.0 +onap/sdc-backend,1.2.0 +onap/sdc-backend-init,1.2.0 +onap/sdc-cassandra,1.2.0 +onap/sdc-cassandra-init,1.2.0 +onap/sdc-elasticsearch,1.2.0 +onap/sdc-frontend,1.2.0 +onap/sdc-init-elasticsearch,1.2.0 +onap/sdc-kibana,1.2.0 +onap/sdc-onboard-backend,1.2.0 +onap/sdc-onboard-cassandra-init,1.2.0 +onap/sdc-simulator,1.2.0 +onap/sdc-ui-tests,1.2.0 onap/sdc/sdc-workflow-designer,1.1.0 onap/sdnc-ansible-server-image,1.3.4 onap/sdnc-dmaap-listener-image,1.3.4 diff --git a/version-manifest/src/main/scripts/check-docker-manifest.sh b/version-manifest/src/main/scripts/check-docker-manifest.sh index 26e63b82d..6aa2374b1 100755 --- a/version-manifest/src/main/scripts/check-docker-manifest.sh +++ b/version-manifest/src/main/scripts/check-docker-manifest.sh @@ -18,20 +18,12 @@ for line in $(tail -n +2 $1); do image=$(echo $line | cut -d , -f 1) tag=$(echo $line | cut -d , -f 2) - tags=$(curl -s $NEXUS_PUBLIC_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null) + tags=$(curl -s $NEXUS_RELEASE_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null) echo "$tags" | grep -q "^$tag\$" if [ $? -ne 0 ]; then - echo "[ERROR] $image:$tag not found" + echo "[ERROR] $image:$tag not released" #echo "$tags" | sed 's/^/ /' (( err++ )) - - else - tags=$(curl -s $NEXUS_RELEASE_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null) - echo "$tags" | grep -q "^$tag\$" - if [ $? -ne 0 ]; then - echo "[WARN] $image:$tag not released" - #echo "$tags" | sed 's/^/ /' - fi fi done exit $err -- cgit 1.2.3-korg From 2655a8b7e55b540422071af9792c28e6faa1396c Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 6 Jun 2018 15:38:56 -0700 Subject: Bump master branch to version 3.0.0 Change-Id: I42b1b9122dfc713ba64e17b7dc79ea3ede45abe0 Issue-ID: INT-504 Signed-off-by: Gary Wu --- version-manifest/pom.xml | 2 +- version.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml index 89fb1b170..2b9722819 100644 --- a/version-manifest/pom.xml +++ b/version-manifest/pom.xml @@ -8,7 +8,7 @@ org.onap.integration version-manifest - 2.0.0-SNAPSHOT + 3.0.0-SNAPSHOT maven-plugin ONAP Version Manifest and Maven Plugin https://www.onap.org diff --git a/version.properties b/version.properties index af0373d50..ddc6dd849 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,7 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major_version=2 +major_version=3 minor_version=0 patch_version=0 -- cgit 1.2.3-korg From 18ce86fa26f9df9b44af66c20820731db9498b8f Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 6 Jun 2018 18:26:38 -0700 Subject: Update lab heat template env file Update lab heat template env file to match latest heat template Change-Id: Ideed8dc51bb560f5cb9434c49fefab21cdb4106d Issue-ID: INT-506 Signed-off-by: Gary Wu --- test/ete/labs/huawei/onap-openstack-template.env | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env index a14eeecc5..6575759c8 100644 --- a/test/ete/labs/huawei/onap-openstack-template.env +++ b/test/ete/labs/huawei/onap-openstack-template.env @@ -38,7 +38,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.1.1 + artifacts_version: 1.2.1-SNAPSHOT openstack_tenant_id: ${OS_PROJECT_ID} @@ -85,6 +85,11 @@ parameters: vid_ip_addr: 172.16.8.1 clamp_ip_addr: 172.16.12.1 openo_ip_addr: 172.16.14.1 + music_ip_addr: 172.16.15.1 + oof_ip_addr: 172.16.16.1 + aaf_ip_addr: 172.16.13.1 + sms_ip_addr: 172.16.13.2 + nbi_ip_addr: 172.16.17.1 ########################### # # -- cgit 1.2.3-korg From e5f628308ed20d02a6b0cbf745365fe4c18ec262 Mon Sep 17 00:00:00 2001 From: ranpollak Date: Thu, 7 Jun 2018 14:32:02 +0300 Subject: Add BVT test for SDC Issue-ID: INT-300 Change-Id: Ia6d8416ca743f943d174e59d28988dc72f2d0fa4 Signed-off-by: ranpollak --- S3Ptools/Jmeter/BVT.jmx | 3663 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3663 insertions(+) create mode 100644 S3Ptools/Jmeter/BVT.jmx diff --git a/S3Ptools/Jmeter/BVT.jmx b/S3Ptools/Jmeter/BVT.jmx new file mode 100644 index 000000000..e3eaf29cb --- /dev/null +++ b/S3Ptools/Jmeter/BVT.jmx @@ -0,0 +1,3663 @@ + + + + + omrir1_598_06-06-2016-08-52 || omrir1_680_09-06-2016-14-43 + true + true + + + + ASDC_SETUP + ${__P(setup,ranp_955_26-06-2016-13-41)} + = + + + NUM_OF_THREAD + ${__P(iterations,1)} + = + + + TEST_DURATION + ${__P(Duration,1)} + = + + + MAIN_THREAD_GROUP_CNT + ${__P(loops,1)} + = + + + + + true + + + + + + ################## Test-Params ################## + ############################################## + ############################################## + = + + + TestName + 000-BackEnd_BVT.log + = + + + step + 0 + = + + + product + ASDC + = + + + dashboard_path + /sdc1/proxy-designer1#/dashboard + = + + + service_name + Internet_${__RandomString(5,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz,)} + = + + + fileRepo + /qa-test-repo/asdc_repo/heat_tmpl/438/ + = + + + file + HeatValidations.zip + = + + + zip + application/zip + = + + + ##################### URL #################### + ############################################## + ############################################## + = + + + port + 8080 + = + + + protocol + http + = + + + ############################################## + ############################################## + ############################################## + = + + + HTTP_CSP_ATTUID + BVT + = + + + attvdi142 + + + + continue + + false + 1 + + 1 + 1 + 1422885662000 + 1422885662000 + false + + + + + + false + 0 + rm + + + + + -rf + = + + + + /tmp/TestResult/${TestName} + = + + + + + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + + false + 0 + cat + + + + + ASDC.txt + = + + + + + + + /qa-test-repo/API/ + + + + false + + + String ResponseString = prev.getResponseDataAsString(); + +String[] ActionItem= ResponseString.split("\n"); + +for( String s : ActionItem) +{ + log.info("line is : " + s); + log.info("key is : " + s.split("!~!~!")[0]); + log.info("value is : " + s.split("!~!~!")[1]); + props.put(s.split("!~!~!")[0], s.split("!~!~!")[1]); +} + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + /tmp/TestResult/ResultsTree.csv + + + + + false + 0 + bash + + + + + Get_SUT_Params.sh + = + + + + ${product} + = + + + + ${ASDC_SETUP}.xml + = + + + + + + + /qa-test-repo/scripts/ASDC/ + + + + false + + + String ResponseString = prev.getResponseDataAsString(); + +log.info("########################" + ResponseString); + +String[] ActionItem= ResponseString.split("\n"); + +for( String s : ActionItem) +{ + log.info("line is : " + s); + log.info("data field name is : " + s.split(" ")[0]); + log.info("value is : " + s.split(" ")[1]); + props.put(s.split(" ")[0], s.split(" ")[1]); +} + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + /tmp/TestResult/ResultsTree.csv + + + + + + continue + + false + ${MAIN_THREAD_GROUP_CNT} + + ${NUM_OF_THREAD} + ${TEST_DURATION} + 1422885662000 + 1422885662000 + false + + + + + + + + Accept + application/json + + + Content-Type + application/json + + + HTTP_CSP_ATTUID + ${HTTP_CSP_ATTUID} + + + Accept - application/octet-stream + + + + + + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/VLM_props.txt)})}; + + + false + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/VLM_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + VLM + "value":"(.+?)" + $1$ + 0 + 1 + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +props.put("VLM_P","${VLM}"); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Create Vendor License Model "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${VLM} + GET + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 300 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +import org.apache.jmeter.services.FileServer; +import test.TestParse.*; + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +Map map = new HashMap(); + +map.put("vendorName","${__P(VLM_vendorName)}"); +map.put("description","${__P(VLM_description)}"); +map.put("iconRef","${__P(VLM_iconRef)}"); +map.put("id","${__P(VLM_P)}"); + + +DataValidation dv = new DataValidation(); +String res = dv.verifyResponse(map,ResponseString); + +p.println("\n#######################"+" Get Vendor License Model "+"#######################"); + +if (ResponseCode.contains("200") && !res.contains("FAIL")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +p.println("#####################################################################\n"); + +p.close();f.close(); + + + + + + + + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/EP_props.txt)})} + + + false + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/EP_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/${__P(EP)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + entityId + "value":"(.+?)" + $1$ + 0 + 1 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +props.put("EPid_P","${entityId}"); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +p.println("\n#######################"+" Create Entitlement Pool Step "+"#######################"); +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create REST failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + 300 + + + + 1 + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/${__P(EP)}/${__P(EPid_P)} + GET + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 300 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +import org.apache.jmeter.services.FileServer; +import test.TestParse.*; + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +Map map = new HashMap(); + +map.put("name","${__P(EP_name)}"); +map.put("description","${__P(EP_description)}"); +//map.put("thresholdValue",props.get("EP_thresholdValue")); +map.put("thresholdUnits","${__P(EP_thresholdUnits)}"); +//map.put("entitlementMetric",props.get("EP_entitlementMetric")); +map.put("increments","${__P(EP_increments)}"); +//map.put("aggregationFunction",props.get("EP_aggregationFunction")); +//map.put("operationalScope",props.get("EP_operationalScope")); +//map.put("time",props.get("EP_time")); +map.put("manufacturerReferenceNumber","${__P(EP_manufacturerReferenceNumber)}"); + +map.put("id","${__P(EPid_P)}"); + + +DataValidation dv = new DataValidation(); +String res = dv.verifyResponse(map,ResponseString); + +p.println("\n#######################"+" Get Entitlement Pool "+"#######################"); + +if (ResponseCode.contains("200") && !res.contains("FAIL")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +p.println("#####################################################################\n"); + +p.close();f.close(); + + + + 1 + + + + + + + + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/LKG_props.txt)})} + + + false + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/LKG_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/${__P(LKG)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + entityId + "value":"(.+?)" + $1$ + 0 + 1 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +props.put("LKGid_P","${entityId}"); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +p.println("\n#######################"+" Create License Key Group Step "+"#######################"); +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create REST failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + 300 + + + + 1 + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/${__P(LKG)}/${__P(LKGid_P)} + GET + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 300 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +import org.apache.jmeter.services.FileServer; +import test.TestParse.*; + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +Map map = new HashMap(); + +map.put("name","${__P(LKG_name)}"); +map.put("description","${__P(LKG_description)}"); +//map.put("aggregationFunction",props.get("LKG_type")); +//map.put("operationalScope",props.get("LKG_operationalScope")); +map.put("id","${__P(LKGid_P)}"); + +DataValidation dv = new DataValidation(); +String res = dv.verifyResponse(map,ResponseString); + +p.println("\n#######################"+" Get License Key Group "+"#######################"); + +if (ResponseCode.contains("200") && !res.contains("FAIL")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +p.println("#####################################################################\n"); + +p.close();f.close(); + + + + 1 + + + + + + + + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/FG_props.txt)})} + + + false + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/FG_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/${__P(FG)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + entityId + "value":"(.+?)" + $1$ + 0 + 1 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +props.put("FGid_P","${entityId}"); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +p.println("\n#######################"+" Create Feature Group Step "+"#######################"); +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create REST failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + 300 + + + + 1 + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/${__P(FG)}/${__P(FGid_P)} + GET + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 300 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +import org.apache.jmeter.services.FileServer; +import test.TestParse.*; + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +Map map = new HashMap(); + +map.put("name","${__P(FG_name)}"); +map.put("description","${__P(FG_description)}"); +map.put("partNumber","${__P(FG_partNumber)}"); + +map.put("id","${__P(FGid_P)}"); + +DataValidation dv = new DataValidation(); +String res = dv.verifyResponse(map,ResponseString); + +p.println("\n#######################"+" Get Feature Group "+"#######################"); + +if (ResponseCode.contains("200") && !res.contains("FAIL")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +p.println("#####################################################################\n"); + +p.close();f.close(); + + + + 1 + + + + + + + + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/LA_props.txt)})} + + + false + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/LA_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/${__P(LA)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + entityId + "value":"(.+?)" + $1$ + 0 + 1 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +props.put("LAid_P","${entityId}"); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +p.println("\n#######################"+" Create License Agreement Step "+"#######################"); +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create REST failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + 300 + + + + 1 + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/${__P(LA)}/${__P(LAid_P)} + GET + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + 300 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +import org.apache.jmeter.services.FileServer; +import test.TestParse.*; + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +Map map = new HashMap(); + +map.put("name","${__P(LA_name)}"); +map.put("description","${__P(LA_description)}"); +//map.put("licenseModelType","${LA_licenseModelType}"); +map.put("requirementsAndConstrains","${__P(LA_requirementsAndConstrains)}"); +map.put("id","${__P(LAid_P)}"); + +DataValidation dv = new DataValidation(); +String res = dv.verifyResponse(map,ResponseString); + +p.println("\n#######################"+" Get License Agreement "+"#######################"); + +if (ResponseCode.contains("200") && !res.contains("FAIL")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + + p.println(res); +} +p.println("#####################################################################\n"); + +p.close();f.close(); + + + + 1 + + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/Action_Checkin.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/actions + PUT + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Checkin VLM "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create VLM REST failed."); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/Action_Submit.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_prefix)}/${__P(VLM_P)}/actions + PUT + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Submit VLM "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create VLM REST failed."); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + false + 0 + ls + + + + + + + ${fileRepo} + + + + + + + String ResponseString = prev.getResponseDataAsString(); + + +String[] ActionItem = ResponseString.split("\n"); +int i=1; + +for( String s : ActionItem) +{ + log.info("line is : " + s); + vars.put("files"+i, s); + i++; +} + + + beanshell + + + + + files + index + false + + + + + + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/VSP_props.txt)})} + + + false + + + + 300 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/VSP_body.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_VSP)} + POST + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + entityId + "vspId":"(.+?)" + $1$ + 0 + 1 + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +props.put("VSP_P","${entityId}"); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; +p.println("\n#######################"+" Create Vendor Software Products Step "+"#######################"); +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Create REST failed."); + p.println("Response String : " + ResponseString); +} +p.println("#####################################################################\n"); +p.close();f.close(); + + + + 300 + + + + 1 + + + + + + + + + ${fileRepo}${index} + + ${zip} + + + + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_VSP)}/${__P(VSP_P)}/upload + POST + true + false + true + true + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + status + "status":"(.+?)" + $1$ + 0 + 1 + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" ${__samplerName} "+"#######################"); + +if (ResponseCode.contains("200") || "${status}".equals("Success")) +{ + + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); + +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/Action_Checkin.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_VSP)}/${__P(VSP_P)}/actions + PUT + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Checkin VSP "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/Action_Submit.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_VSP)}/${__P(VSP_P)}/actions + PUT + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Submit VSP "+"#######################"); + +if (!ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 0 + + + + + true + + + + false + ${__eval(${__FileToString(/qa-test-repo/TestsProperties/ASDC/Action_CreatePackage.txt)})} + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_VSP)}/${__P(VSP_P)}/actions + PUT + true + false + true + false + HttpClient3.1 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + packageId + "packageId":"(.+?)" + $1$ + 0 + 1 + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" ${__samplerName} "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + + false + 0 + mkdir + + + + + -p + = + + + + /tmp/${__TestPlanName}_${__P(VSP_P)} + = + + + + + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + ${protocol} + + ${__P(ASDC_VSP)}/${__P(PKG)}/${__P(VSP_P)} + GET + true + false + true + false + HttpClient3.1 + false + + + + + + + HTTP_CSP_ATTUID + ${HTTP_CSP_ATTUID} + + + Accept + application/octet-stream + + + Accept - application/octet-stream + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + /tmp/${__TestPlanName}_${__P(VSP_P)}/${__P(VSP_P)}.zip + false + true + true + true + + + + false + + + //String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Download Package "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + //p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + //p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + false + 0 + unzip + + + + + * + = + + + + + + + /tmp/${__TestPlanName}_${__P(VSP_P)}/ + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + 300 + + + + + false + 0 + rm + + + + + -rf + = + + + + ${__P(VSP_P)}.zip + = + + + + + + + /tmp/${__TestPlanName}_${__P(VSP_P)}/ + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + 300 + + + + + false + 0 + bash + + + + + dos2unixCall.sh + = + + + + /qa-test-repo/TestsProperties/HEATFiles/SimpleHEATtoTOSCA + = + + + + + + + /qa-test-repo/scripts/ASDC/ + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + 300 + + + + + false + 0 + bash + + + + + dos2unixCall.sh + = + + + + ${__eval(/tmp/${__TestPlanName}_${__P(VSP_P)})} + = + + + + + + + /qa-test-repo/scripts/ASDC/ + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + 300 + + + + + false + 0 + diff + + + + + -x + = + + + + *example.xml + = + + + + -r + = + + + + /qa-test-repo/TestsProperties/HEATFiles/SimpleHEATtoTOSCA + = + + + + /tmp/${__TestPlanName}_${__P(VSP_P)} + = + + + + + + + + -x *example.xml + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); + +props.put("diffOutput",ResponseString); + + + + + + + false + 0 + cat + + + + + MainServiceTemplate.yaml + = + + + + + + + /qa-test-repo/TestsProperties/HEATFiles/SimpleHEATtoTOSCA/Definitions + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); + +props.put("tosca1",ResponseString); + + + + + + + false + 0 + cat + + + + + MainServiceTemplate.yaml + = + + + + + + + /tmp/${__TestPlanName}_${__P(VSP_P)}/Definitions/ + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); + +props.put("tosca2",ResponseString); + + + + + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +String file1 = props.get("tosca1"); +String file2 = props.get("tosca2"); + +p.println("\n#######################"+" ${__samplerName} "+"#######################"); + +p.println("\n<<<<<<<<<<<<<<<<<<<<<<<"+" diff Output: "+">>>>>>>>>>>>>>>>>>>>>>\n"); +if(props.get("diffOutput").equals("")){ + p.println(mydate + " : No change in files"); + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println(mydate + " : Files are equals!"); +}else{ + p.println(mydate + " : \n"+props.get("diffOutput")); + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println(mydate + " : Files are NOT equals!!!"); +} +p.println("\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); + +p.println("############################################################################\n"); + +p.close();f.close(); + + + false + + + + + continue + + false + ${MAIN_THREAD_GROUP_CNT} + + ${NUM_OF_THREAD} + ${TEST_DURATION} + 1422885662000 + 1422885662000 + false + + + + + + + + Accept + application/json + + + Content-Type + application/json + + + + + + false + 0 + rm + + + + + -rf + = + + + + /tmp/${__TestPlanName}_${__P(VSP_P)}/ + = + + + + + + + + + + + true + + + + false + + = + + + + ${__P(VM_controller)} + ${port} + + + http + + ${__P(ASDC_VSP)}/${__P(vspId)} + DELETE + true + false + true + false + HttpClient4 + false + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + false + false + false + false + false + 0 + true + true + + + + + + + false + + + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + +String test_tmp_folder = "/tmp/TestResult/${TestName}"; + f = new FileOutputStream(test_tmp_folder, true); + p = new PrintStream(f); + +mydate = "${__time(dd-MM-yyyy hh:mm:ss)}"; + +p.println("\n#######################"+" Delete Temporary VSP "+"#######################"); + +if (ResponseCode.contains("200")) +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: PASS"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage); + p.println("Response String : " + ResponseString); +} +else +{ + p.println(mydate + " : Thread number ${__threadNum()} in step ${__samplerName}: FAIL"); + p.println("Response Code : " + ResponseCode); + p.println("Response Message : " + ResponseMessage + "\nERROR: Delete VSP REST failed."); + p.println("Response String : " + ResponseString); +} + +p.println("############################################################################\n"); + +p.close();f.close(); + + + + 300 + + + + 1 + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + false + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/ResponseCodesPerSecond.jtl + 1000 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/ResponseTimesDistribution.jtl + 100 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/ResponseTimesOverTime.jtl + 500 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/ResponseTimesPercentiles.jtl + 500 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + false + 0 + true + true + + + /tmp/TestResult/HitsPerSecond.jtl + 1000 + false + + + + + false + false + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + true + true + true + true + true + true + true + true + true + false + true + 0 + true + true + true + true + true + true + true + + + /tmp/TestResult/ResultsTable.xml + + + + + true + + + + + + false + String ResponseString = prev.getResponseDataAsString(); +String ResponseCode = prev.getResponseCode(); +String ResponseMessage = prev.getResponseMessage(); + + +vars.put("ResponseCode",ResponseCode); +vars.put("ResponseString",ResponseString); +vars.put("ResponseMessage",ResponseMessage); + + + + + -- cgit 1.2.3-korg From d77cb63fe253a8f9335764aeecf971348c894728 Mon Sep 17 00:00:00 2001 From: Pawel Kadlubanski Date: Thu, 7 Jun 2018 15:48:38 +0200 Subject: Changing docker image tag Issue-ID: INT-458 Change-Id: Iffde91aa44e76ebbb76bc03c570a3a4298f76278 Signed-off-by: Pawel Kadlubanski --- test/mocks/pnfsimulator/pom.xml | 4 ++-- test/mocks/pnfsimulator/simulator.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml index 040f37023..2fee83622 100644 --- a/test/mocks/pnfsimulator/pom.xml +++ b/test/mocks/pnfsimulator/pom.xml @@ -6,7 +6,7 @@ org.onap.pnfsimulator pnf-simulator - 1.0-SNAPSHOT + 1.0.0-SNAPSHOT pnf-simulator @@ -15,7 +15,7 @@ 1.8 1.8 org.onap.pnfsimulator.Main - latest + ${project.version}-latest libs ${project.build.directory}/${dependency.directory.name} nexus3.onap.org:10003 diff --git a/test/mocks/pnfsimulator/simulator.sh b/test/mocks/pnfsimulator/simulator.sh index 5e8b2d5ac..d1185565f 100755 --- a/test/mocks/pnfsimulator/simulator.sh +++ b/test/mocks/pnfsimulator/simulator.sh @@ -5,7 +5,7 @@ set -euo pipefail CONTAINER_NAME=pnf-simulator CONFIG_FILE_PATH=/config/body.json SIMULATOR_DOCKER_HUB=nexus3.onap.org:10003/onap -SIMULATOR_TAG=latest +SIMULATOR_TAG=1.0.0-SNAPSHOT-latest function main(){ -- cgit 1.2.3-korg