From 508bf653f0f208ad20b4159ec4eae17fec9b114b Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Wed, 12 Oct 2016 17:56:28 +0200 Subject: Bug fixes and updates to fit ODL Boron SR0 Small bug fixes and some changes are done in order to be compatible with ODL Boron SR0 Change-Id: I02f2ed8c734145ff6e198f9529728a97a5c97a75 Signed-off-by: Manuel Buil --- testcases/features/sfc/compute_presetup_CI.bash | 4 +-- testcases/features/sfc/delete.sh | 9 +++---- testcases/features/sfc/sfc.py | 31 ++--------------------- testcases/features/sfc/sfc_colorado1.py | 33 ++----------------------- 4 files changed, 9 insertions(+), 68 deletions(-) (limited to 'testcases/features') diff --git a/testcases/features/sfc/compute_presetup_CI.bash b/testcases/features/sfc/compute_presetup_CI.bash index c776c2f8c..23b2e4c92 100755 --- a/testcases/features/sfc/compute_presetup_CI.bash +++ b/testcases/features/sfc/compute_presetup_CI.bash @@ -13,8 +13,8 @@ ip=`sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'fuel node'|grep com awk '{print $10}' | head -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 478b59782..c701bd0f3 100755 --- a/testcases/features/sfc/sfc.py +++ b/testcases/features/sfc/sfc.py @@ -82,15 +82,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" @@ -219,7 +210,7 @@ def main(): logger.info("Creating instance '%s'..." % INSTANCE_NAME) 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, @@ -372,15 +363,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 @@ -438,16 +420,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 5580d9ed5..2e8d81611 100755 --- a/testcases/features/sfc/sfc_colorado1.py +++ b/testcases/features/sfc/sfc_colorado1.py @@ -81,15 +81,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" @@ -225,7 +216,7 @@ def main(): logger.info("Creating instance '%s'..." % INSTANCE_NAME) 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, @@ -393,16 +384,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 @@ -460,17 +441,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 -- cgit 1.2.3-korg