9 files changed, 112 insertions, 2 deletions
diff --git a/test/csit/plans/dcae/testsuites/setup.sh b/test/csit/plans/dcaegen2/testsuites/setup.sh
index d7f02bcdf..3068b5026 100755
--- a/test/csit/plans/dcae/testsuites/setup.sh
+++ b/test/csit/plans/dcaegen2/testsuites/setup.sh
@@ -31,7 +31,7 @@ docker run -d -p 8080:8080/tcp -p 8443:8443/tcp -P --name vesc -e DMAAPHOST=${HO
 VESC_IP=`get-instance-ip.sh vesc`
 export VESC_IP=${VESC_IP}
 
-export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcae/testcases/resources"
+export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2/testcases/resources"
 
 # Wait container ready
 sleep 5
diff --git a/test/csit/plans/dcae/testsuites/teardown.sh b/test/csit/plans/dcaegen2/testsuites/teardown.sh
index 2dc14870f..2dc14870f 100755
--- a/test/csit/plans/dcae/testsuites/teardown.sh
+++ b/test/csit/plans/dcaegen2/testsuites/teardown.sh
diff --git a/test/csit/plans/dcaegen2/testsuites/testplan.txt b/test/csit/plans/dcaegen2/testsuites/testplan.txt
new file mode 100755
index 000000000..fbf08839e
--- /dev/null
+++ b/test/csit/plans/dcaegen2/testsuites/testplan.txt
@@ -0,0 +1,3 @@
+# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Place the suites in run order.
+dcaegen2/testcases
diff --git a/test/csit/plans/vid/healthCheck/setup.sh b/test/csit/plans/vid/healthCheck/setup.sh
new file mode 100644
index 000000000..afe9ea7ba
--- /dev/null
+++ b/test/csit/plans/vid/healthCheck/setup.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Copyright 2016-2017 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
+#
+# 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.
+#
+# Modifications copyright (c) 2017 AT&T Intellectual Property
+#
+# Place the scripts in run order:
+
+
+source ${WORKSPACE}/test/csit/scripts/vid/clone_and_setup_vid_data.sh
+
+source ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh
+
+
+BE_IP=`get-instance-ip.sh vid-server`
+echo BE_IP=${BE_IP}
+
+
+# Pass any variables required by Robot test suites in ROBOT_VARIABLES
+ROBOT_VARIABLES="-v BE_IP:${BE_IP}"
+
diff --git a/test/csit/plans/vid/healthCheck/teardown.sh b/test/csit/plans/vid/healthCheck/teardown.sh
new file mode 100644
index 000000000..e82ef3068
--- /dev/null
+++ b/test/csit/plans/vid/healthCheck/teardown.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# Copyright 2016-2017 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
+#
+# 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.
+#
+# Modifications copyright (c) 2017 AT&T Intellectual Property
+#
+
+source ${WORKSPACE}/test/csit/scripts/vid/kill_containers_and_remove_dataFolders.sh
+
+# $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging
diff --git a/test/csit/plans/dcae/testsuites/testplan.txt b/test/csit/plans/vid/healthCheck/testplan.txt
index 777842a3a..ffbb593ca 100755..100644
--- a/test/csit/plans/dcae/testsuites/testplan.txt
+++ b/test/csit/plans/vid/healthCheck/testplan.txt
@@ -1,3 +1,3 @@
 # Test suites are relative paths under [integration.git]/test/csit/tests/.
 # Place the suites in run order.
-dcae/testcases
+vid/healthCheck
diff --git a/test/csit/plans/vnfsdk-pkgtools/sanity-check/setup.sh b/test/csit/plans/vnfsdk-pkgtools/sanity-check/setup.sh
new file mode 100755
index 000000000..7e109b7c0
--- /dev/null
+++ b/test/csit/plans/vnfsdk-pkgtools/sanity-check/setup.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Copyright 2016-2017 Intel Corp., 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
+#
+# 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.
+#
+# Modifications copyright (c) 2017 AT&T Intellectual Property
+#
+# Place the scripts in run order:
+
+# Clone vnfsdk/pkgtools repo and install it
+mkdir -p $WORKSPACE/archives/pkgtools
+cd $WORKSPACE/archives
+git clone -b master --single-branch http://gerrit.onap.org/r/vnfsdk/pkgtools.git pkgtools
+cd $WORKSPACE/archives/pkgtools
+git pull
+python setup.py install
+
+pip freeze | tee $WORKSPACE/archives/_pip-freeze-after-setup.txt
+
+# Pass any variables required by Robot test suites in ROBOT_VARIABLES
+ROBOT_VARIABLES="-v SCRIPTS:${SCRIPTS}"
+
diff --git a/test/csit/plans/vnfsdk-pkgtools/sanity-check/teardown.sh b/test/csit/plans/vnfsdk-pkgtools/sanity-check/teardown.sh
new file mode 100755
index 000000000..ce0ab6d9c
--- /dev/null
+++ b/test/csit/plans/vnfsdk-pkgtools/sanity-check/teardown.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Copyright 2016-2017 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
+#
+# 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.
+#
diff --git a/test/csit/plans/vnfsdk-pkgtools/sanity-check/testplan.txt b/test/csit/plans/vnfsdk-pkgtools/sanity-check/testplan.txt
new file mode 100644
index 000000000..f47c44ed0
--- /dev/null
+++ b/test/csit/plans/vnfsdk-pkgtools/sanity-check/testplan.txt
@@ -0,0 +1,3 @@
+# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Place the suites in run order.
+vnfsdk-pkgtools/tosca-metadata/create_open.robot