aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/csit/plans/dcaegen2/testsuites/setup.sh2
-rwxr-xr-xtest/csit/plans/dmaap-buscontroller/mock_downstream/setup.sh42
-rw-r--r--test/csit/plans/dmaap-buscontroller/mock_downstream/teardown.sh26
-rw-r--r--test/csit/plans/dmaap-buscontroller/mock_downstream/testplan.txt4
-rw-r--r--test/csit/plans/sdnc/healthcheck/teardown.sh1
-rw-r--r--test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh2
-rw-r--r--test/csit/scripts/dmaap-buscontroller/.mock-aaf.sh.swpbin0 -> 12288 bytes
-rwxr-xr-xtest/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh52
-rwxr-xr-xtest/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh30
-rwxr-xr-xtest/csit/scripts/dmaap-buscontroller/init-mock-aaf.sh53
-rwxr-xr-xtest/csit/scripts/dmaap-buscontroller/init-mock-drps.sh17
-rwxr-xr-xtest/csit/scripts/dmaap-buscontroller/init-mock-mrc.sh17
-rw-r--r--test/csit/scripts/dmaap-buscontroller/onapCSIT.env18
-rwxr-xr-xtest/csit/scripts/dmaap-buscontroller/start-mock.sh48
-rw-r--r--test/csit/tests/dmaap-buscontroller/suite1/__init__.robot3
-rw-r--r--test/csit/tests/dmaap-buscontroller/suite1/test1.robot42
-rw-r--r--test/csit/tests/holmes/testcase/EngineMgt/Engine-Mgt.robot4
-rw-r--r--test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot24
-rw-r--r--test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot12
19 files changed, 375 insertions, 22 deletions
diff --git a/test/csit/plans/dcaegen2/testsuites/setup.sh b/test/csit/plans/dcaegen2/testsuites/setup.sh
index 6692bb209..8ee1309bb 100755
--- a/test/csit/plans/dcaegen2/testsuites/setup.sh
+++ b/test/csit/plans/dcaegen2/testsuites/setup.sh
@@ -21,7 +21,7 @@
#get current host IP addres
HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
-VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.1
+VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.2-latest
echo VESC_IMAGE=${VESC_IMAGE}
# Start DCAE VES Collector
diff --git a/test/csit/plans/dmaap-buscontroller/mock_downstream/setup.sh b/test/csit/plans/dmaap-buscontroller/mock_downstream/setup.sh
new file mode 100755
index 000000000..a19454be5
--- /dev/null
+++ b/test/csit/plans/dmaap-buscontroller/mock_downstream/setup.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# ============LICENSE_START=======================================================
+# org.onap.dmaap
+# ================================================================================
+# Copyright (C) 2018 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=========================================================
+#
+#
+
+
+# Place the scripts in run order:
+source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+start_mock "aaf"
+AAF_IP=${IP}
+start_mock "mrc" 3904
+MRC_IP=${IP}
+start_mock "drps"
+DRPS_IP=${IP}
+
+source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh
+dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
+DMAAPBC_IP=${IP}
+
+
+echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
+
+# Pass any variables required by Robot test suites in ROBOT_VARIABLES
+ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
+
diff --git a/test/csit/plans/dmaap-buscontroller/mock_downstream/teardown.sh b/test/csit/plans/dmaap-buscontroller/mock_downstream/teardown.sh
new file mode 100644
index 000000000..1b041a425
--- /dev/null
+++ b/test/csit/plans/dmaap-buscontroller/mock_downstream/teardown.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# ============LICENSE_START=======================================================
+# org.onap.dmaap
+# ================================================================================
+# Copyright (C) 2018 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=========================================================
+#
+#
+kill-instance.sh aaf-mock
+kill-instance.sh drps-mock
+kill-instance.sh mrc-mock
+kill-instance.sh dmaapbc
+
diff --git a/test/csit/plans/dmaap-buscontroller/mock_downstream/testplan.txt b/test/csit/plans/dmaap-buscontroller/mock_downstream/testplan.txt
new file mode 100644
index 000000000..39a2f4499
--- /dev/null
+++ b/test/csit/plans/dmaap-buscontroller/mock_downstream/testplan.txt
@@ -0,0 +1,4 @@
+# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Place the suites in run order.
+dmaap-buscontroller/suite1
+
diff --git a/test/csit/plans/sdnc/healthcheck/teardown.sh b/test/csit/plans/sdnc/healthcheck/teardown.sh
index 925e7b732..dd465bb33 100644
--- a/test/csit/plans/sdnc/healthcheck/teardown.sh
+++ b/test/csit/plans/sdnc/healthcheck/teardown.sh
@@ -22,5 +22,6 @@ kill-instance.sh sdnc_dgbuilder_container
kill-instance.sh sdnc_portal_container
kill-instance.sh sdnc_db_container
kill-instance.sh sdnc_ueblistener_container
+kill-instance.sh sdnc_dmaaplistener_container
# $WORKSPACE/archives/appc deleted with archives folder when tests starts so we keep it at the end for debugging
diff --git a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
index e04feac41..1c3e4e83a 100644
--- a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
+++ b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
@@ -23,7 +23,7 @@ docker run -d -i -t --name=postgres -p 5432:5432 nexus3.onap.org:10001/onap/re
POSTGRES=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' postgres`
#Start market place
-docker run -d -i -t --name=refrepo -e POSTGRES_IP=$POSTGRES -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.0-STAGING-latest
+docker run -d -i -t --name=refrepo -e POSTGRES_IP=$POSTGRES -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.1-STAGING-latest
# Wait for Market place initialization
echo Wait for VNF Repository initialization
diff --git a/test/csit/scripts/dmaap-buscontroller/.mock-aaf.sh.swp b/test/csit/scripts/dmaap-buscontroller/.mock-aaf.sh.swp
new file mode 100644
index 000000000..edadfe903
--- /dev/null
+++ b/test/csit/scripts/dmaap-buscontroller/.mock-aaf.sh.swp
Binary files differ
diff --git a/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh b/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh
new file mode 100755
index 000000000..7ec7345d5
--- /dev/null
+++ b/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# $1 is the IP address of the buscontroller
+# $2 is the IP address of the DRPS
+# $3 is the IP address of the MRC
+
+# INITIALIZE: dmaap object
+JSON=/tmp/$$.dmaap
+cat << EOF > $JSON
+{
+ "version": "1",
+ "topicNsRoot": "org.onap.dmaap",
+ "drProvUrl": "http://${2}:8080",
+ "dmaapName": "onapCSIT",
+ "bridgeAdminTopic": "MM_AGENT_PROV"
+
+}
+EOF
+
+curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dmaap
+
+
+
+# INITIALIZE: dcaeLocation object
+JSON=/tmp/$$.loc
+cat << EOF > $JSON
+{
+ "dcaeLocationName": "csit-sanfrancisco",
+ "dcaeLayer": "central-cloud",
+ "clli": "CSIT12345",
+ "zone": "zoneA"
+
+}
+EOF
+
+curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dcaeLocations
+
+
+# INITIALIZE: MR object in 1 site
+JSON=/tmp/$$.mrc
+cat << EOF > $JSON
+{
+ "dcaeLocationName": "csit-sanfrancisco",
+ "fqdn": "$3",
+ "hosts" : [ "$3", "$3", "$3" ],
+ "protocol" : "https",
+ "port": "3094"
+
+}
+EOF
+
+curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/mr_clusters
diff --git a/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh b/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh
new file mode 100755
index 000000000..f8f8c24e0
--- /dev/null
+++ b/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# script to launch DMaaP buscontroller docker container
+# sets global var IP with assigned IP address
+
+function dmaapbc_launch() {
+ TAG=dmaap/buscontroller
+ CONTAINER_NAME=dmaapbc
+ IP=""
+
+ cd ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller
+
+ TMP_CFG=/tmp/docker-databys-controller.conf
+ . ./onapCSIT.env > $TMP_CFG
+ docker run -d --name $CONTAINER_NAME -v $TMP_CFG:/opt/app/config/conf $TAG
+ IP=`get-instance-ip.sh ${CONTAINER_NAME}`
+
+ # Wait for initialization
+ for i in {1..10}; do
+ curl -sS ${IP}:8080 && break
+ echo sleep $i
+ sleep $i
+ done
+
+ set -x
+ ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${IP}
+ set +x
+
+
+}
diff --git a/test/csit/scripts/dmaap-buscontroller/init-mock-aaf.sh b/test/csit/scripts/dmaap-buscontroller/init-mock-aaf.sh
new file mode 100755
index 000000000..f25404ce3
--- /dev/null
+++ b/test/csit/scripts/dmaap-buscontroller/init-mock-aaf.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# $1 is the IP address of the AAF mock server
+
+#curl -v -X PUT -d @- http://$1:1080/expectation << EOF
+#{
+# "httpRequest": {
+# "method": "GET",
+# "path": "/hello"
+# },
+# "httpResponse": {
+# "body": "Hello world!",
+# "statusCode": 200
+# },
+# "times" : {
+# "unlimited" : true
+# }
+#}
+#EOF
+# "httpRequest": {
+# "method": "POST",
+# "path": "/proxy/authz/.*"
+# },
+
+curl -v -X PUT -d @- http://$1:1080/expectation << EOF
+{
+ "httpRequest": {
+ "method": ".*",
+ "path": "/.*"
+ },
+ "httpResponse": {
+ "body": "Hello world!",
+ "statusCode": 200
+ },
+ "times" : {
+ "unlimited" : true
+ }
+}
+EOF
+
+#curl -v -X PUT -d @- http://$1:1080/expectation << EOF
+#{
+# "httpRequest": {
+# "method": "POST",
+# "path": "/proxy/authz/role/perm"
+# },
+# "httpResponse": {
+# "body": "Hello world!",
+# "statusCode": 200
+# }
+#}
+#EOF
+
diff --git a/test/csit/scripts/dmaap-buscontroller/init-mock-drps.sh b/test/csit/scripts/dmaap-buscontroller/init-mock-drps.sh
new file mode 100755
index 000000000..e0f1d0f19
--- /dev/null
+++ b/test/csit/scripts/dmaap-buscontroller/init-mock-drps.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# $1 is the IP address of the DRPS (Data Router Provisioning Server) mock server
+
+curl -v -X PUT -d @- http://$1:1080/expectation << EOF
+{
+ "httpRequest": {
+ "method": "GET",
+ "path": "/hello"
+ },
+ "httpResponse": {
+ "body": "Hello world!",
+ "statusCode": 200
+ }
+}
+EOF
+
diff --git a/test/csit/scripts/dmaap-buscontroller/init-mock-mrc.sh b/test/csit/scripts/dmaap-buscontroller/init-mock-mrc.sh
new file mode 100755
index 000000000..75c1a419a
--- /dev/null
+++ b/test/csit/scripts/dmaap-buscontroller/init-mock-mrc.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# $1 is the IP address of the MRC (MR Central) mock server
+
+curl -v -X PUT -d @- http://$1:1080/expectation << EOF
+{
+ "httpRequest": {
+ "method": "GET",
+ "path": "/hello"
+ },
+ "httpResponse": {
+ "body": "Hello world!",
+ "statusCode": 200
+ }
+}
+EOF
+
diff --git a/test/csit/scripts/dmaap-buscontroller/onapCSIT.env b/test/csit/scripts/dmaap-buscontroller/onapCSIT.env
new file mode 100644
index 000000000..58432e6a7
--- /dev/null
+++ b/test/csit/scripts/dmaap-buscontroller/onapCSIT.env
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# environment settings for Dmaap Bus Controller Integration Test.
+# assumes args are:
+# $1 - FQDN of AAF server
+# $2 - FQDN of MR server
+# $3 - FQDN of DRPS Server
+# Only need to set values where defaults aren't appropriate
+#
+cat <<!EOF
+DMAAPBC_INT_HTTPS_PORT=0
+DMAAPBC_PG_ENABLED=false
+DMAAPBC_INSTANCE_NAME=ONAP-CSIT
+DMAAPBC_AAF_URL=https://${1}:1080/proxy/
+DMAAPBC_MR_CNAME=${2}
+DMAAPBC_DRPROV_FQDN=${3}
+DMAAPBC_CSIT=Yes
+!EOF
diff --git a/test/csit/scripts/dmaap-buscontroller/start-mock.sh b/test/csit/scripts/dmaap-buscontroller/start-mock.sh
new file mode 100755
index 000000000..b4707c5af
--- /dev/null
+++ b/test/csit/scripts/dmaap-buscontroller/start-mock.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# ============LICENSE_START=======================================================
+# org.onap.dmaap
+# ================================================================================
+# Copyright (C) 2018 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=========================================================
+#
+#
+
+#
+# starts a mock server container named $1-mock
+# and runs init-mock-$1.sh to initialize it
+# modifies global var IP to provide the IP address of the started container
+function start_mock() {
+ IP=""
+ app=$1
+ port=${2:-1080}
+ docker run --name ${app}-mock -d jamesdbloom/mockserver /opt/mockserver/run_mockserver.sh -logLevel INFO -serverPort ${port} -proxyPort 1090
+ IP=`get-instance-ip.sh ${app}-mock`
+
+ # Wait for initialization
+ for i in {1..10}; do
+ curl -sS ${IP}:${port} && break
+ echo sleep $i
+ sleep $i
+ done
+
+ set -x
+ ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/init-mock-${app}.sh ${IP}
+ set +x
+
+ # this is the output of this function
+ #echo "$IP"
+}
+
diff --git a/test/csit/tests/dmaap-buscontroller/suite1/__init__.robot b/test/csit/tests/dmaap-buscontroller/suite1/__init__.robot
new file mode 100644
index 000000000..41c7a0037
--- /dev/null
+++ b/test/csit/tests/dmaap-buscontroller/suite1/__init__.robot
@@ -0,0 +1,3 @@
+*** Settings ***
+Documentation dmaap-buscontroller - Suite 1
+
diff --git a/test/csit/tests/dmaap-buscontroller/suite1/test1.robot b/test/csit/tests/dmaap-buscontroller/suite1/test1.robot
new file mode 100644
index 000000000..be4e8cc6c
--- /dev/null
+++ b/test/csit/tests/dmaap-buscontroller/suite1/test1.robot
@@ -0,0 +1,42 @@
+*** Settings ***
+Library OperatingSystem
+Library RequestsLibrary
+
+*** Variables ***
+${MESSAGE} Hello, world!
+${DBC_URI} /webapi
+
+*** Test Cases ***
+String Equality Test
+ Should Be Equal ${MESSAGE} Hello, world!
+
+Dir Test
+ [Documentation] Check if /tmp exists
+ Log ${MESSAGE}
+ CheckDir /tmp
+
+Url Test
+ [Documentation] Check if www.onap.org can be reached
+ Create Session openo http://www.onap.org
+ CheckUrl openo / 200
+
+Mock Hello Server Test
+ [Documentation] Check /hello endpoint
+ Create Session hello http://${AAF_IP}:1080
+ CheckUrl hello /hello 200
+
+Heartbeat Test
+ [Documentation] Check ${DBC_URI}/info endpoint
+ Create Session heartbeat http://${DMAAPBC_IP}:8080
+ CheckUrl heartbeat ${DBC_URI}/info 204
+
+*** Keywords ***
+CheckDir
+ [Arguments] ${path}
+ Directory Should Exist ${path}
+
+CheckUrl
+ [Arguments] ${session} ${path} ${expect}
+ ${resp}= Get Request ${session} ${path}
+ Should Be Equal As Integers ${resp.status_code} ${expect}
+
diff --git a/test/csit/tests/holmes/testcase/EngineMgt/Engine-Mgt.robot b/test/csit/tests/holmes/testcase/EngineMgt/Engine-Mgt.robot
index 0c06cbb97..5a8e81146 100644
--- a/test/csit/tests/holmes/testcase/EngineMgt/Engine-Mgt.robot
+++ b/test/csit/tests/holmes/testcase/EngineMgt/Engine-Mgt.robot
@@ -22,13 +22,13 @@ verify_valid_rule
deploy_invalid_rule
[Documentation] Add a rule with invalid contents to the engine.
- ${dic3} create dictionary content=789789789 engineid=""
+ ${dic3} create dictionary content=789789789 engineId=""
${Jsonparam} encode ${dic3}
${response} deployEngineRule ${Jsonparam} -1
deploy_valid_rule
[Documentation] Add a rule with valid contents to the engine.
- ${dic4} create dictionary content=package rule03080002;\n\nimport java.util.Locale; engineid="" loopcontrolname=test
+ ${dic4} create dictionary content=package rule03080002;\n\nimport java.util.Locale; engineId="" loopControlName=test
${Jsonparam} encode ${dic4}
${response} deployEngineRule ${Jsonparam}
diff --git a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
index a28bc36ff..9ec65854b 100644
--- a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
+++ b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
@@ -8,17 +8,17 @@ Resource Rule-Keywords.robot
*** Test Cases ***
add_valid_rule
[Documentation] Add a valid rule.
- ${dict2} create dictionary rulename=youbowu0314 description=create a new rule! content=package ruleqwertasd;\n\nimport java.util.Locale; enabled=1 loopcontrolname=closedControlLoop
+ ${dict2} create dictionary ruleName=youbowu0314 description=create a new rule! content=package ruleqwertasd;\n\nimport java.util.Locale; enabled=1 loopControlName=closedControlLoop
${jsonParams} encode ${dict2}
${response} createRule ${jsonParams}
${respJson} to json ${response.content}
- ${RULEID} get from dictionary ${respJson} ruleid
+ ${RULEID} get from dictionary ${respJson} ruleId
set global variable ${RULEID}
log ${RULEID}
add_invalid_content_rule
[Documentation] Add an invalid rule of which the content is incorrect!!
- ${dict1} create dictionary rulename=gy0307001 description=create a new rule! content=123123123 enabled=1
+ ${dict1} create dictionary ruleName=gy0307001 description=create a new rule! content=123123123 enabled=1
${jsonParams} encode ${dict1}
${response} createRule ${jsonParams} -1
log ${response.content}
@@ -39,21 +39,21 @@ query_rule_with_existing_id
query_rule_with_non_existing_id
[Documentation] Query a rule with a non-existing ID.
- ${response} queryConditionRule {"rid":"invalidid"}
+ ${response} queryConditionRule {"ruleid":"invalidid"}
${respJson} to json ${response.content}
${count} get from dictionary ${respJson} totalCount
run keyword if ${count}!=0 fail
query_rule_with_partial_existing_name
[Documentation] Query rules with (a part of) an existing name.
- ${response} queryConditionRule {"rulename":"youbowu"}
+ ${response} queryConditionRule {"ruleName":"youbowu"}
${respJson} to json ${response.content}
${count} get from dictionary ${respJson} totalCount
run keyword if ${count}<1 fail Can't find the rule with (a part of) an existing name
query_rule_with_partial_non_existing_name
[Documentation] Query rules with (a part of) a non-existing name.
- ${response} queryConditionRule {"name":"zte2017"}
+ ${response} queryConditionRule {"rulename":"zte2017"}
${respJson} to json ${response.content}
${count} get from dictionary ${respJson} totalCount
run keyword if ${count}!=0 fail
@@ -81,7 +81,7 @@ query_rule_with_empty_status
query_rule_with_combinational_fields
[Documentation] Query rules using the combination of different fields.
- ${dic} create dictionary rulename=youbowu0314 enabled=1
+ ${dic} create dictionary ruleName=youbowu0314 enabled=1
${paramJson} encode ${dic}
${response} queryConditionRule ${paramJson}
${respJson} to json ${response.content}
@@ -91,10 +91,10 @@ query_rule_with_combinational_fields
modify_rule_with_status
[Documentation] modify the rule with a valid status.
- ${dic} create dictionary ruleid=${RULEID} enabled=0 content=package rule03140002 loopcontrolname=closedControlLoop
+ ${dic} create dictionary ruleId=${RULEID} enabled=0 content=package rule03140002 loopControlName=closedControlLoop
${modifyParam} encode ${dic}
${modifyResp} modifyRule ${modifyParam}
- ${response} queryConditionRule {"ruleid":"${RULEID}"}
+ ${response} queryConditionRule {"ruleId":"${RULEID}"}
${respJson} to json ${response.content}
${count} get from dictionary ${respJson} totalCount
run keyword if ${count}!=1 fail query rule fails! (can't find the rule modified!) ELSE traversalRuleAttribute ${respJson}
@@ -102,16 +102,16 @@ modify_rule_with_status
modify_rule_with_invalid_status
[Documentation] modify the rule with an invalid status.
- ${dic} create dictionary ruleid=${RULEID} enabled=88 content=package rule03140002
+ ${dic} create dictionary ruleId=${RULEID} enabled=88 content=package rule03140002
${modifyParam} encode ${dic}
${modifyResponse} modifyRule ${modifyParam} -1
modify_rule_with_description
[Documentation] modify the description of the rule with the new string.
- ${dic} create dictionary ruleid=${RULEID} description=now, i modifying the description of the rule. content=package rule03140002 loopcontrolname=closedControlLoop
+ ${dic} create dictionary ruleId=${RULEID} description=now, i modifying the description of the rule. content=package rule03140002 loopControlName=closedControlLoop
${modifyParam} encode ${dic}
${modifyResp} modifyRule ${modifyParam}
- ${response} queryConditionRule {"ruleid":"${RULEID}"} 1
+ ${response} queryConditionRule {"ruleId":'${RULEID}'} 1
${respJson} to json ${response.content}
${count} get from dictionary ${respJson} totalCount
run keyword if ${count}!=1 fail query rule fails! ELSE traversalRuleAttribute ${respJson}
diff --git a/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot b/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot
index c57642a2e..01ece239f 100644
--- a/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot
+++ b/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot
@@ -15,7 +15,7 @@ ${csarId} 0
Upload VNF Package to VNF Repository
[Documentation] Upload the VNF Package
- ${resp}= Run curl -s -X POST -H "Content-Type: multipart/form-data" -F "file=@${csarpath}" http://${REPO_IP}:8702/openoapi/vnfsdk-marketplace/v1/PackageResource/csars
+ ${resp}= Run curl -s -X POST -H "Content-Type: multipart/form-data" -F "file=@${csarpath}" http://${REPO_IP}:8702/onapapi/vnfsdk-marketplace/v1/PackageResource/csars
Should Contain ${resp} csarId
${csarjson}= Evaluate ${resp}
${csarId}= Set Variable ${csarjson["csarId"]}
@@ -24,7 +24,7 @@ Upload VNF Package to VNF Repository
Get VNF Package Information from Repository
Create Session refrepo http://${REPO_IP}:8702
&{headers}= Create Dictionary Content-Type=application/json
- ${resp}= Get Request refrepo /openoapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId} headers=${headers}
+ ${resp}= Get Request refrepo /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId} headers=${headers}
${response_json} json.loads ${resp.content}
${downloadUri}= Convert To String ${response_json['downloadUri']}
Should Contain ${downloadUri} ${csarId}
@@ -33,16 +33,16 @@ Get VNF Package Information from Repository
Get List Of Requests
Create Session refrepo http://${REPO_IP}:8702
&{headers}= Create Dictionary Content-Type=application/json
- ${resp}= Get Request refrepo /openoapi/vnfsdk-marketplace/v1/PackageResource/csars?name=enterprise2DC&version=1.0&type=SSAR&provider=huawei headers=${headers}
+ ${resp}= Get Request refrepo /onapapi/vnfsdk-marketplace/v1/PackageResource/csars?name=enterprise2DC&version=1.0&type=SSAR&provider=huawei headers=${headers}
Should Be Equal As Strings ${resp.status_code} 200
Download VNF Package from Repository
Create Session refrepo http://${REPO_IP}:8702
&{headers}= Create Dictionary Content-Type=application/json
- ${resp}= Get Request refrepo /openoapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId}/files headers=${headers}
+ ${resp}= Get Request refrepo /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId}/files headers=${headers}
Should Be Equal As Strings ${resp.status_code} 200
${downloadUri}= Convert To String ${resp.content}
- ${downloadUri1}= Run curl http://${REPO_IP}:8702/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId}/files
+ ${downloadUri1}= Run curl http://${REPO_IP}:8702/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId}/files
${string}= Convert To String ${downloadUri1}
Should Contain ${downloadUri1} ' % Total % Received % Xferd Average
Should Contain ${string} ' % Total % Received % Xferd Average
@@ -50,6 +50,6 @@ Download VNF Package from Repository
Delete VNF Package from Repository
Create Session refrepo http://${REPO_IP}:8702
&{headers}= Create Dictionary Content-Type=application/json
- ${resp}= Delete Request refrepo /openoapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId} headers=${headers}
+ ${resp}= Delete Request refrepo /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId} headers=${headers}
Should Be Equal As Strings ${resp.status_code} 200