summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFu Jinhua <fu.jinhua@zte.com.cn>2017-09-14 11:09:09 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-14 11:09:09 +0000
commit0791b966cac0d90054b1e94a88347257f4fe0600 (patch)
tree8d184a33192e30a4125720907bbbf4212e1a2b55
parent5524e69639beab4f7a160e06c7cd7b3797b3b692 (diff)
parentc37933b31232eab745089f1e5e3f682f095599c6 (diff)
Merge "Add robot SCRIPTS env for vfc-nfvo-lcm"
-rwxr-xr-xtest/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh2
-rw-r--r--test/csit/tests/vfc/nfvo-lcm/jsoninput/create_ns.json3
-rw-r--r--test/csit/tests/vfc/nfvo-lcm/test.robot3
3 files changed, 5 insertions, 3 deletions
diff --git a/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
index d75b1cadb..3cc53988c 100755
--- a/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
@@ -55,4 +55,4 @@ for i in {1..10}; do
done
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v NSLCM_IP:${NSLCM_IP}"
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v NSLCM_IP:${NSLCM_IP} -v SCRIPTS:${SCRIPTS}"
diff --git a/test/csit/tests/vfc/nfvo-lcm/jsoninput/create_ns.json b/test/csit/tests/vfc/nfvo-lcm/jsoninput/create_ns.json
index 0d2027f21..bb39364bb 100644
--- a/test/csit/tests/vfc/nfvo-lcm/jsoninput/create_ns.json
+++ b/test/csit/tests/vfc/nfvo-lcm/jsoninput/create_ns.json
@@ -1,5 +1,6 @@
{
"nsName": "ns1",
"csarId": "123",
- "description": "ns1 desc"
+ "description": "ns1 desc",
+ "test": "test"
} \ No newline at end of file
diff --git a/test/csit/tests/vfc/nfvo-lcm/test.robot b/test/csit/tests/vfc/nfvo-lcm/test.robot
index 71bf6acad..44d23292e 100644
--- a/test/csit/tests/vfc/nfvo-lcm/test.robot
+++ b/test/csit/tests/vfc/nfvo-lcm/test.robot
@@ -4,6 +4,7 @@ Library Collections
Library RequestsLibrary
Library OperatingSystem
Library json
+Library HttpLibrary.HTTP
*** Variables ***
@{return_ok_list}= 200 201 202 204
@@ -12,7 +13,7 @@ ${create_ns_url} /api/nslcm/v1/ns
${delete_ns_url} /api/nslcm/v1/ns
#json files
-${create_ns_json} ${SCRIPTS}/../test/vfc/nfvo-lcm/jsoninput/create_ns.json
+${create_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/create_ns.json
#global variables
${nsInstId}