aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/features/sfc
diff options
context:
space:
mode:
Diffstat (limited to 'testcases/features/sfc')
-rwxr-xr-xtestcases/features/sfc/compute_presetup_CI.bash4
-rwxr-xr-xtestcases/features/sfc/delete.sh9
-rwxr-xr-xtestcases/features/sfc/sfc.py31
-rwxr-xr-xtestcases/features/sfc/sfc_colorado1.py33
4 files changed, 9 insertions, 68 deletions
diff --git a/testcases/features/sfc/compute_presetup_CI.bash b/testcases/features/sfc/compute_presetup_CI.bash
index 39276b43a..36148aa15 100755
--- a/testcases/features/sfc/compute_presetup_CI.bash
+++ b/testcases/features/sfc/compute_presetup_CI.bash
@@ -14,8 +14,8 @@ pushd $BASEDIR
ip=$1
echo $ip
-sshpass -p r00tme scp $ssh_options correct_classifier.bash ${INSTALLER_IP}:/root
-sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'scp correct_classifier.bash '"$ip"':/root'
+#sshpass -p r00tme scp $ssh_options correct_classifier.bash ${INSTALLER_IP}:/root
+#sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'scp correct_classifier.bash '"$ip"':/root'
sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'ssh root@'"$ip"' ifconfig br-int up'
output=$(sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'ssh root@'"$ip"' ip route | \
diff --git a/testcases/features/sfc/delete.sh b/testcases/features/sfc/delete.sh
index b8d1fde1c..c04ae6375 100755
--- a/testcases/features/sfc/delete.sh
+++ b/testcases/features/sfc/delete.sh
@@ -8,11 +8,8 @@ tacker vnf-delete testVNF1
tacker vnf-delete testVNF2
tacker vnfd-delete test-vnfd1
tacker vnfd-delete test-vnfd2
-#openstack stack delete sfc --y
-heat stack-delete sfc --y
-#openstack stack delete sfc_test1 --y
-heat stack-delete sfc_test1 --y
-#openstack stack delete sfc_test2 --y
-heat stack-delete sfc_test2 --y
+openstack stack delete sfc --y
+openstack stack delete sfc_test1 --y
+openstack stack delete sfc_test2 --y
nova delete client
nova delete server
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index 789bb714e..3c7110623 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -83,15 +83,6 @@ def main():
stderr=subprocess.PIPE)
ip_server = process.stdout.readline().rstrip()
- contr_cmd2 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2"
- " 'fuel node'|grep compute|awk '{print $10}'")
- logger.info("Executing script to get ip_compute: '%s'" % contr_cmd2)
- process = subprocess.Popen(contr_cmd2,
- shell=True,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- ip_compute = process.stdout.readline().rstrip()
-
iptable_cmd1 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2"
" ssh " + ip_server + " iptables -P INPUT ACCEPT ")
iptable_cmd2 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2"
@@ -221,7 +212,7 @@ def main():
logger.info("Creating instance '%s'..." % INSTANCE_NAME_2)
logger.debug(
"Configuration:\n name=%s \n flavor=%s \n image=%s \n "
- "network=%s \n" % (INSTANCE_NAME, FLAVOR, image_id, network_id))
+ "network=%s \n" % (INSTANCE_NAME_2, FLAVOR, image_id, network_id))
instance_2 = os_utils.create_instance_and_wait_for_active(FLAVOR,
image_id,
network_id,
@@ -375,15 +366,6 @@ def main():
except Exception:
logger.exception("vxlan_tool not started in SF2")
- # SSH to modify the classification flows in compute
-
- contr_cmd3 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2"
- " 'ssh " + ip_compute + " 'bash correct_classifier.bash''")
- logger.info("Executing script to modify the classi: '%s'" % contr_cmd3)
- process = subprocess.Popen(contr_cmd3,
- shell=True,
- stdout=subprocess.PIPE)
-
i = 0
# SSH TO EXECUTE cmd_client
@@ -442,16 +424,7 @@ def main():
subprocess.call(tacker_classi, shell=True)
logger.info("Wait for ODL to update the classification rules in OVS")
- time.sleep(10)
-
- # SSH to modify the classification flows in compute
-
- contr_cmd4 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2"
- " 'ssh " + ip_compute + " 'bash correct_classifier.bash''")
- logger.info("Executing script to modify the classi: '%s'" % contr_cmd4)
- process = subprocess.Popen(contr_cmd4,
- shell=True,
- stdout=subprocess.PIPE)
+ time.sleep(100)
# SSH TO EXECUTE cmd_client
diff --git a/testcases/features/sfc/sfc_colorado1.py b/testcases/features/sfc/sfc_colorado1.py
index 734421fc3..f40d9cce6 100755
--- a/testcases/features/sfc/sfc_colorado1.py
+++ b/testcases/features/sfc/sfc_colorado1.py
@@ -84,15 +84,6 @@ def main():
stderr=subprocess.PIPE)
ip_server = process.stdout.readline().rstrip()
- contr_cmd2 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2"
- " 'fuel node'|grep compute|awk '{print $10}'")
- logger.info("Executing script to get ip_compute: '%s'" % contr_cmd2)
- process = subprocess.Popen(contr_cmd2,
- shell=True,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- ip_compute = process.stdout.readline().rstrip()
-
iptable_cmd1 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2"
" ssh " + ip_server + " iptables -P INPUT ACCEPT ")
iptable_cmd2 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2"
@@ -240,7 +231,7 @@ def main():
logger.info("Creating instance '%s'..." % INSTANCE_NAME_2)
logger.debug(
"Configuration:\n name=%s \n flavor=%s \n image=%s \n "
- "network=%s \n" % (INSTANCE_NAME, FLAVOR, image_id, network_id))
+ "network=%s \n" % (INSTANCE_NAME_2, FLAVOR, image_id, network_id))
instance_2 = os_utils.create_instance_and_wait_for_active(
FLAVOR,
image_id,
@@ -409,16 +400,6 @@ def main():
except Exception:
logger.exception("vxlan_tool not started in SF2")
- # SSH to modify the classification flows in compute
-
- contr_cmd3 = ("sshpass -p r00tme ssh " + ssh_options + " "
- "root@10.20.0.2 'ssh " + ip_compute + " "
- "'bash correct_classifier.bash''")
- logger.info("Executing script to modify the classi: '%s'" % contr_cmd3)
- process = subprocess.Popen(contr_cmd3,
- shell=True,
- stdout=subprocess.PIPE)
-
i = 0
# SSH TO EXECUTE cmd_client
@@ -496,17 +477,7 @@ def main():
subprocess.call(tacker_classi, shell=True)
logger.info("Wait for ODL to update the classification rules in OVS")
- time.sleep(10)
-
- # SSH to modify the classification flows in compute
-
- contr_cmd4 = ("sshpass -p r00tme ssh " + ssh_options + " "
- "root@10.20.0.2 'ssh " + ip_compute + " "
- "'bash correct_classifier.bash''")
- logger.info("Executing script to modify the classi: '%s'" % contr_cmd4)
- process = subprocess.Popen(contr_cmd4,
- shell=True,
- stdout=subprocess.PIPE)
+ time.sleep(100)
# SSH TO EXECUTE cmd_client