From f36958a959064cb3f1c8ab47fd28ce9bf2727ca6 Mon Sep 17 00:00:00 2001
From: "ying.yunlong" <ying.yunlong@zte.com.cn>
Date: Wed, 13 Sep 2017 11:01:41 +0800
Subject: Add vfc-driver-gvnfm jujudriver csit

Change-Id: Ic1a899f4669bf160c3f03316e931633ab31b0193
Issue-ID: VFC-349
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---
 .../vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh      | 13 ++++++++++++-
 .../vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh   |  2 +-
 .../vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt  |  2 +-
 test/csit/tests/vfc/nfvo-driver-gvnfm/jujudriver.robot    | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
index a4e2cf3e6..2a364a407 100644
--- a/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
@@ -52,5 +52,16 @@ for i in {1..10}; do
     sleep $i
 done
 
+# start vfc-jujudriver
+docker run -d --name vfc-jujudriver -e MSB_ADDR=${MSB_DISCOVERY_IP}:10081 nexus3.onap.org:10001/onap/vfc/jujudriver
+JUJUDRIVER_IP=`get-instance-ip.sh vfc-jujudriver`
+
+# Wait for initialization
+for i in {1..10}; do
+    curl -sS ${JUJUDRIVER_IP}:8483 && break
+    echo sleep $i
+    sleep $i
+done
+
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP}"
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP} -v JUJUDRIVER_IP:${JUJUDRIVER_IP}"
diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh b/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
index a55050251..78d7c5ad9 100644
--- a/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
+++ b/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
@@ -21,4 +21,4 @@ kill-instance.sh msb_discovery
 kill-instance.sh msb_consul
 kill-instance.sh  vfc-gvnfmdriver
 
-# kill-instance.sh vfc-jujudriver
+kill-instance.sh vfc-jujudriver
diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt b/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
index 7cca2fbe5..e7bee519b 100644
--- a/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
+++ b/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
@@ -3,4 +3,4 @@
 
 vfc/nfvo-driver-gvnfm/gvnfmdriver.robot
 
-# vfc/nfvo-driver-gvnfm/jujudriver.robot
+vfc/nfvo-driver-gvnfm/jujudriver.robot
diff --git a/test/csit/tests/vfc/nfvo-driver-gvnfm/jujudriver.robot b/test/csit/tests/vfc/nfvo-driver-gvnfm/jujudriver.robot
index 8b1378917..d571ee91f 100644
--- a/test/csit/tests/vfc/nfvo-driver-gvnfm/jujudriver.robot
+++ b/test/csit/tests/vfc/nfvo-driver-gvnfm/jujudriver.robot
@@ -1 +1,16 @@
+*** settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     simplejson
+Library     OperatingSystem
+Library     json
+Library     HttpLibrary.HTTP
 
+*** Variables ***
+@{return_ok_list}=   200  201  202
+${queryswagger_url}    /openoapi/jujuvnfm/v1/swagger.json
+
+*** Test Cases ***
+SwaggerFuncTest
+    [Documentation]    query swagger info rest test
+    Should Be Equal    2.0    2.0
-- 
cgit 1.2.3-korg