Revert "Test for Bug Netvirt-1080"

This reverts commit 14615b37bd847b344f1f3eacbbcf2eceb4e63df4.

Change-Id: I8f70ffa0bfba88ee818db4622705482a7b1e4b40
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 974440e5510d618fcac04583ee1e3afd406dc6bc..6f2725af4fecfa0bb3bc2cc21eccb91f67b0d0fd 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -138,11 +138,6 @@ Create And Associate Floating IPs
     \    ${output} =    OpenStack CLI    openstack server add floating ip ${vm} @{ip}[0]
     [Return]    ${ip_list}
 
-Remove Floating Ip From Vm
-    [Arguments]    ${vm_name}    ${fip}
-    [Documentation]    Remove the Floating IP From VM Instance
-    ${output} =    OpenStack CLI    openstack server remove floating ip ${vm_name} ${fip}
-
 Delete Floating IP
     [Arguments]    ${fip}
     [Documentation]    Delete floating ip with neutron request.

diff --git a/csit/suites/openstack/connectivity/external_network.robot b/csit/suites/openstack/connectivity/external_network.robot
index 503064ccf50c36851209d9cda1b81522913d6ad7..ed41f8677ee446a097a0a89683fd50c45919801a 100644 (file)
--- a/csit/suites/openstack/connectivity/external_network.robot
+++ b/csit/suites/openstack/connectivity/external_network.robot
@@ -104,16 +104,6 @@ Verify Created Routers
     : FOR    ${router}    IN    @{ROUTERS}
     \    Should Contain    ${data}    ${router}
 
-Ping External Network PNF from Vm Instance 1
-    [Documentation]    Check reachability of External Network PNF from VM instance (with ttl=1 to make sure no router hops)
-    ${dst_ip}=    BuiltIn.Create List    ${EXTERNAL_PNF}
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET1_FIP_VM_IPS}[0]    ${dst_ip}    ttl=1
-
-Ping External Network PNF from Vm Instance 2
-    [Documentation]    Check reachability of External Network PNF from VM instance (with ttl=1 to make sure no router hops)
-    ${dst_ip}=    BuiltIn.Create List    ${EXTERNAL_PNF}
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET1_FIP_VM_IPS}[1]    ${dst_ip}    ttl=1
-
 Create And Associate Floating IPs for VMs
     [Documentation]    Create and associate a floating IP for the VM
     ${VM_FLOATING_IPS} =    OpenStackOperations.Create And Associate Floating IPs    ${EXTERNAL_NET_NAME}    @{NET1_FIP_VMS}
@@ -205,24 +195,6 @@ Ping External Network PNF from SNAT VM Instance2
     ${dst_ip} =    BuiltIn.Create List    ${EXTERNAL_PNF}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET1_SNAT_VM_IPS}[1]    ${dst_ip}    ping_should_succeed=${expect_ping_to_work}
 
-Remove Floating Ip from VM Instance 1
-    [Documentation]    Delete FIP from VM Instance 1
-    OpenStackOperations.Remove Floating Ip From Vm    @{NET1_FIP_VMS}[0]    @{VM_FLOATING_IPS}[0]
-
-Remove Floating Ip from VM Instance 2
-    [Documentation]    Delete FIP from VM Instance 2
-    OpenStackOperations.Remove Floating Ip From Vm    @{NET1_FIP_VMS}[1]    @{VM_FLOATING_IPS}[1]
-
-Ping External Network PNF from Vm Instance 1
-    [Documentation]    Check reachability of External Network PNF from VM instance (with ttl=1 to make sure no router hops)
-    ${dst_ip} =    BuiltIn.Create List    ${EXTERNAL_PNF}
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET1_FIP_VM_IPS}[0]    ${dst_ip}    ttl=1
-
-Ping External Network PNF from Vm Instance 2
-    [Documentation]    Check reachability of External Network PNF from VM instance (with ttl=1 to make sure no router hops)
-    ${dst_ip} =    BuiltIn.Create List    ${EXTERNAL_PNF}
-    OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET1_FIP_VM_IPS}[1]    ${dst_ip}    ttl=1
-
 Delete Vm Instances
     [Documentation]    Delete Vm instances using instance names.
     : FOR    ${vm}    IN    @{NET1_FIP_VMS}