Align tests with common approach across adhoc/CI/Functest environments.

JIRA: COPPER-4

Change-Id: I1b7f498b7b0d53e503396d75c40e6db26f0fa21b
Signed-off-by: blsaws <bryan.sullivan@att.com>

6 files changed, 16 insertions, 17 deletions

diff --git a/tests/dmz-clean.sh b/tests/dmz-clean.sh
index 6859192..0823cad 100644
--- a/tests/dmz-clean.sh
+++ b/tests/dmz-clean.sh
@@ -18,11 +18,14 @@
 #
 # Status: this is a work in progress, under test. 
 #
+# Prequisite: OPFNV installed per JOID or Apex installer
+# - OpenStack CLI environment variables setup
 # How to use:
 #   Install Congress test server per https://wiki.opnfv.org/copper/academy
-#   $ source ~/git/copper/tests/adhoc/dmz.sh
-#   After test, cleanup with
-#   $ bash ~/git/copper/tests/adhoc/dmz-clean.sh
+#   # Create Congress policy and resources that exercise policy
+#   $ bash dmz.sh
+#   After test, cleanup
+#   $ bash dmz-clean.sh
 
 if [  $# -eq 1 ]; then
   if [ $1 == "debug" ]; then 
@@ -30,8 +33,6 @@ if [  $# -eq 1 ]; then
   fi
 fi
 
-source /tmp/copper/admin-openrc.sh
-
 echo "Get Congress policy 'test' ID"
 test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }")
 
diff --git a/tests/dmz.sh b/tests/dmz.sh
index 3cff177..fd5d5b2 100644
--- a/tests/dmz.sh
+++ b/tests/dmz.sh
@@ -26,6 +26,8 @@
 #
 # Status: this is a work in progress, under test.
 #
+# Prequisite: OPFNV installed per JOID or Apex installer
+# - OpenStack CLI environment variables setup
 # How to use:
 #   Install Congress test server per https://wiki.opnfv.org/copper/academy
 #   # Create Congress policy and resources that exercise policy
@@ -56,11 +58,6 @@ if [  $# -eq 1 ]; then
   fi
 fi
 
-echo "Activate virtualenv if needed"
-cd ~/congress/venv
-source bin/activate
-source /tmp/copper/admin-openrc.sh
-
 echo "Create Congress policy 'test'"
 if [ $(openstack congress policy show test | awk "/ id / { print \$4 }") ]; then unclean; fi
 openstack congress policy create test
diff --git a/tests/reserved_subnet-clean.sh b/tests/reserved_subnet-clean.sh
index 3c0cf9c..56c6c5a 100644
--- a/tests/reserved_subnet-clean.sh
+++ b/tests/reserved_subnet-clean.sh
@@ -21,6 +21,8 @@
 #
 # Status: this is a work in progress, under test. 
 #
+# Prequisite: OPFNV installed per JOID or Apex installer
+# - OpenStack CLI environment variables setup
 # How to use:
 #   Install Congress test server per https://wiki.opnfv.org/copper/academy
 #   # Create Congress policy and resources that exercise policy
@@ -33,7 +35,6 @@ if [  $# -eq 1 ]; then
     set -x #echo on
   fi
 fi
-source /tmp/copper/admin-openrc.sh
 
 echo "Get Congress policy 'test' ID"
 test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }")
diff --git a/tests/reserved_subnet.sh b/tests/reserved_subnet.sh
index d76806b..73123b5 100644
--- a/tests/reserved_subnet.sh
+++ b/tests/reserved_subnet.sh
@@ -21,6 +21,8 @@
 #
 # Status: this is a work in progress, under test. 
 #
+# Prequisite: OPFNV installed per JOID or Apex installer
+# - OpenStack CLI environment variables setup
 # How to use:
 #   Install Congress test server per https://wiki.opnfv.org/copper/academy
 #   # Create Congress policy and resources that exercise policy
@@ -51,8 +53,6 @@ if [  $# -eq 1 ]; then
   fi
 fi
 
-source /tmp/copper/admin-openrc.sh
-
 echo "Create Congress policy 'test'"
 if [[ $(openstack congress policy show test | awk "/ id / { print \$4 }") ]]; then unclean; fi
 openstack congress policy create test
diff --git a/tests/smtp_ingress-clean.sh b/tests/smtp_ingress-clean.sh
index e43db81..08f788e 100644
--- a/tests/smtp_ingress-clean.sh
+++ b/tests/smtp_ingress-clean.sh
@@ -18,6 +18,8 @@
 #
 # Status: this is a work in progress, under test. 
 #
+# Prequisite: OPFNV installed per JOID or Apex installer
+# - OpenStack CLI environment variables setup
 # How to use:
 #   Install Congress test server per https://wiki.opnfv.org/copper/academy
 #   $ bash dmz.sh
@@ -30,8 +32,6 @@ if [  $# -eq 1 ]; then
   fi
 fi
 
-source /tmp/copper/admin-openrc.sh
-
 echo "Get Congress policy 'test' ID"
 test_policy_ID=$(openstack congress policy show test | awk "/ id / { print \$4 }")
 
diff --git a/tests/smtp_ingress.sh b/tests/smtp_ingress.sh
index 2c785bd..a800ca2 100644
--- a/tests/smtp_ingress.sh
+++ b/tests/smtp_ingress.sh
@@ -20,6 +20,8 @@
 #
 # Status: this is a work in progress, under test. 
 #
+# Prequisite: OPFNV installed per JOID or Apex installer
+# - OpenStack CLI environment variables setup
 # How to use:
 #   Install Congress test server per https://wiki.opnfv.org/copper/academy
 #   # Create Congress policy and resources that exercise policy
@@ -50,8 +52,6 @@ if [  $# -eq 1 ]; then
   fi
 fi
 
-source /tmp/copper/admin-openrc.sh
-
 echo "Create Congress policy 'test'"
 if [[ $(openstack congress policy show test | awk "/ id / { print \$4 }") ]]; then unclean; fi
 openstack congress policy create test