8 files changed, 44 insertions, 148 deletions
diff --git a/plans/aaf/aafapi/.gitignore b/plans/aaf/aafapi/.gitignore
new file mode 100644
index 00000000..019cc4da
--- /dev/null
+++ b/plans/aaf/aafapi/.gitignore
@@ -0,0 +1 @@
+/authz*
diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh
index 6c88ceb7..82073674 100644
--- a/plans/aaf/aafapi/setup.sh
+++ b/plans/aaf/aafapi/setup.sh
@@ -47,18 +47,20 @@ else
   chmod -R 777 authz
   cd authz
 fi
-
+echo "Current Dir: ${PWD}"
 
 # Locate to Docker dir
 cd auth/docker
 if [ ! -e d.props ]; then
   cp d.props.init d.props
 fi
+echo "Current Dir: ${PWD}"
 source d.props
 
 # Fill in anything missing
 $SED "s/^LATITUDE=.*/LATITUDE=${LATITUDE:=38.0}/" d.props
 $SED "s/^LONGITUDE=.*/LONGITUDE=${LONGITUDE:=-72.0}/" d.props
+$SED "s/^LONGITUDE=.*/LONGITUDE=${LONGITUDE:=-72.0}/" d.props
 # For Jenkins, gotta use 10001, not 10003
 DOCKER_REPOSITORY=nexus3.onap.org:10001
 $SED "s/DOCKER_REPOSITORY=.*/DOCKER_REPOSITORY=$DOCKER_REPOSITORY/"  d.props
@@ -67,39 +69,39 @@ $SED "s/HOSTNAME=.*/HOSTNAME=aaf.api.simpledemo.onap.org/"  d.props
 DOCKER_NAME=$(docker info | grep Name | awk '{print $2}' )
 echo "Docker Name is $DOCKER_NAME"
 
-if [ "$DOCKER_NAME" = "minikube" ]; then
-  echo "Minikube IP"
-  HOST_IP=$(minikube ip)
-else 
-  echo "Trying to get IP from Docker $DOCKER_NAME with 'ip route' method"
-  # ip route get 8.8.8.8
-  HOST_IP=$(ip route get 8.8.8.8 | awk '{print $7}')
-  if [ -z "$HOST_IP" ]; then
-     echo "Critical HOST_IP could not be obtained by 2 different methods.  Exiting..."
-     exit
-  fi
-  echo 
-fi
-$SED "s/HOST_IP=.*/HOST_IP=$HOST_IP/" d.props
-
-cat d.props
-
-# Pull latest Dockers
-AAF_DOCKER_VERSION=${VERSION}
-NEXUS_USERNAME=anonymous
-NEXUS_PASSWD=anonymous
-echo "$NEXUS_PASSWD" | docker login -u $NEXUS_USERNAME --password-stdin $DOCKER_REPOSITORY
-
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_config:$AAF_DOCKER_VERSION
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_cm:$AAF_DOCKER_VERSION
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_fs:$AAF_DOCKER_VERSION
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_gui:$AAF_DOCKER_VERSION
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_hello:$AAF_DOCKER_VERSION
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_locate:$AAF_DOCKER_VERSION
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_oauth:$AAF_DOCKER_VERSION
-docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_service:$AAF_DOCKER_VERSION
 
+#if [ "$DOCKER_NAME" = "minikube" ]; then
+#  echo "Minikube IP"
+#  HOST_IP=$(minikube ip)
+#else 
+#  echo "Trying to get IP from Docker $DOCKER_NAME with 'ip route' method"
+#  # ip route get 8.8.8.8
+#  HOST_IP=$(ip route get 8.8.8.8 | awk '{print $7}')
+#  if [ -z "$HOST_IP" ]; then
+#     echo "Critical HOST_IP could not be obtained by 2 different methods.  Exiting..."
+#     exit
+#  fi
+#  echo 
+#fi
+#$SED "s/HOST_IP=.*/HOST_IP=$HOST_IP/" d.props
+
+if [ -z "$SKIP_PULL" ]; then
+  # Pull latest Dockers
+  AAF_DOCKER_VERSION=${VERSION}
+  NEXUS_USERNAME=anonymous
+  NEXUS_PASSWD=anonymous
+  echo "$NEXUS_PASSWD" | docker login -u $NEXUS_USERNAME --password-stdin $DOCKER_REPOSITORY
+
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_config:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_cm:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_fs:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_gui:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_hello:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_locate:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_oauth:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_service:$AAF_DOCKER_VERSION
+fi
 # Cassandra Install/Start
 cd ../auth-cass/docker
 echo Cassandra Install
@@ -116,14 +118,15 @@ docker images
 
 docker ps -a
 
-for C in aaf_service aaf_locate aaf_oauth aaf_cm aaf_gui aaf_hello aaf_fs; do
+for C in aaf-service aaf-locate aaf-oauth aaf-cm aaf-gui aaf-hello aaf-fs; do
   docker logs $C
 done
 
-bash ./aaf.sh wait aaf_service
+bash ./aaf.sh wait aaf-service
 
-AAF_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_service)
+AAF_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf-service)
 echo AAF_IP=${AAF_IP}
 
-#Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v AAF_IP:${AAF_IP}"
+openssl s_client -connect $AAF_IP:8100
+
+export ROBOT_VARIABLES="-v AAF_IP:${AAF_IP}"
diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh b/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh
deleted file mode 100755
index 3c985aaf..00000000
--- a/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2017 ZTE Corporation.
-#
-# 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.
-#
-# Place the scripts in run order:
-# Start all process required for executing test case
-
-source ${SCRIPTS}/common_functions.sh
-
-#start msb
-docker run -d -p 8500:8500  --name msb_consul consul:0.9.3
-MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
-echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
-
-docker run -d  -p 10081:10081  -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
-MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
-echo DISCOVERY_IP=${MSB_DISCOVERY_IP}
-
-docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
-MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway`
-echo MSB_IAG_IP=${MSB_IAG_IP}
-
-docker run -d -p 3306:3306 --name vfc-db nexus3.onap.org:10001/onap/vfc/db
-VFC_DB_IP=`get-instance-ip.sh vfc-db`
-echo VFC_DB_IP=${VFC_DB_IP}
-
-# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway)
-for i in {1..10}; do
-    curl -sS -m 1 ${MSB_CONSUL_IP}:8500 && curl -sS -m 1 ${MSB_DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IAG_IP}:80 && break
-    echo sleep $i
-    sleep $i
-done
-
-# Wait for initialization(3306 DB)
-for i in {1..3}; do
-    curl -sS -m 1 ${VFC_DB_IP}:3306 && break
-    echo sleep $i
-    sleep $i
-done
-
-# wait for container initalization
-echo sleep 30
-sleep 30
-
-# start vfc-vnfmgr
-docker run -d --name vfc-vnfmgr -e MSB_ADDR=${MSB_IAG_IP}:80 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/vfc/vnfmgr
-VNFMGR_IP=`get-instance-ip.sh vfc-vnfmgr`
-for i in {1..10}; do
-    curl -sS -m 1 ${VNFMGR_IP}:8803 && 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 VNFMGR_IP:${VNFMGR_IP} -v SCRIPTS:${SCRIPTS}"
diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh b/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh
deleted file mode 100755
index cfabe42d..00000000
--- a/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2017 ZTE Corporation.
-#
-# 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.
-#
-
-# This script is sourced by run-csit.sh after Robot test completion.
-kill-instance.sh msb_internal_apigateway
-kill-instance.sh msb_discovery
-kill-instance.sh msb_consul
-kill-instance.sh vfc-db
-kill-instance.sh vfc-vnfmgr
diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt b/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt
deleted file mode 100644
index c90cc935..00000000
--- a/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-vfc/gvnfm-vnfmgr/test.robot
diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
index bdc66d0e..e7ac1f36 100644
--- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
+++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
@@ -52,16 +52,5 @@ for i in {1..10}; do
     sleep $i
 done
 
-# start vfc-jujudriver
-docker run -d --name vfc-jujudriver -e MSB_ADDR=${MSB_IAG_IP}:80 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 GVNFMDRIVER_IP:${GVNFMDRIVER_IP} -v JUJUDRIVER_IP:${JUJUDRIVER_IP}"
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP}"
diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
index 78d7c5ad..d90aad27 100644
--- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
+++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
@@ -19,6 +19,4 @@
 kill-instance.sh msb_internal_apigateway
 kill-instance.sh msb_discovery
 kill-instance.sh msb_consul
-kill-instance.sh  vfc-gvnfmdriver
-
-kill-instance.sh vfc-jujudriver
+kill-instance.sh vfc-gvnfmdriver
diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
index a54f095c..1295b2f8 100644
--- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
+++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
@@ -2,5 +2,3 @@
 # Place the suites in run order.
 
 vfc/nfvo-driver-gvnfm/gvnfmdriver.robot
-
-vfc/nfvo-driver-gvnfm/jujudriver.robot