Revert "ACL Service Recovery" 04/72104/1
authorSam Hague <shague@redhat.com>
Sat, 19 May 2018 15:50:24 +0000 (15:50 +0000)
committerSam Hague <shague@redhat.com>
Sat, 19 May 2018 15:50:24 +0000 (15:50 +0000)
This reverts commit 9d7edc291030d091a056c7f16678a3d2276f0a28.

Change-Id: I87a5c8199a0ebed0de1a16128920d32730bdbf9d
Signed-off-by: Sam Hague <shague@redhat.com>
csit/suites/netvirt/AclServiceRecovery/AclServiceRecovery.robot [deleted file]
csit/testplans/netvirt-1node-openstack.txt

diff --git a/csit/suites/netvirt/AclServiceRecovery/AclServiceRecovery.robot b/csit/suites/netvirt/AclServiceRecovery/AclServiceRecovery.robot
deleted file mode 100644 (file)
index 5537029..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-*** Settings ***
-Documentation     Test Suite for ACL Service Recovery:
-...               The Service Recovery Manager provides
-...               common interface to recover services in ODL.
-...               This feature will register ACL service for recovery
-...               and implement the mechanism to recover ACL service.
-Suite Setup       Start Suite
-Suite Teardown    OpenStackOperations.OpenStack Suite Teardown
-Test Setup        Run Keywords    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-...               AND    OpenStackOperations.Get DumpFlows And Ovsconfig    ${OS_CMP1_CONN_ID}
-Test Teardown     OpenStackOperations.Get Test Teardown Debugs
-Library           OperatingSystem
-Library           RequestsLibrary
-Library           String
-Resource          ../../../libraries/DevstackUtils.robot
-Resource          ../../../libraries/Genius.robot
-Resource          ../../../libraries/KarafKeywords.robot
-Resource          ../../../variables/netvirt/Variables.robot
-Resource          ../../../libraries/OVSDB.robot
-Resource          ../../../libraries/OpenStackOperations.robot
-Resource          ../../../libraries/SetupUtils.robot
-Resource          ../../../libraries/Utils.robot
-Resource          ../../../variables/Variables.robot
-
-*** Variables ***
-${acl_sr_security_group}    acl_sr_sg
-@{acl_sr_networks}    acl_sr_net_1    acl_sr_net_2    acl_sr_net_3
-@{acl_sr_subnets}    acl_sr_sub_1    acl_sr_sub_2    acl_sr_sub_3
-@{acl_sr_subnet_cidrs}    81.1.1.0/24    82.1.1.0/24    83.1.1.0/24
-@{acl_sr_net_1_ports}    acl_sr_net_1_port_1    acl_sr_net_1_port_2
-@{acl_sr_net_1_vms}    acl_sr_net_1_vm_1    acl_sr_net_1_vm_2
-@{table_ids}      211    244    240
-
-*** Test Cases ***
-ACL Service Recovery CLI
-    [Documentation]    This test case covers ACL service recovery.
-    ${count_before} =    Get Dump Flows Count    ${OS_CMP1_CONN_ID}    ${table_ids[0]}
-    ${node_id} =    OVSDB.Get DPID    ${OS_COMPUTE_1_IP}
-    ${resp} =    RequestsLibrary.Delete Request    session    ${CONFIG_NODES_API}/node/openflow:${node_id}/flow-node-inventory:table/${table_ids[0]}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    Wait Until Keyword Succeeds    30s    5s    Verify ACL Flows Should Not Contain    ${OS_CMP1_CONN_ID}    ${table_ids[0]}
-    ${output} =    Issue_Command_On_Karaf_Console    srm:recover service acl
-    Should Contain    ${output}    RPC call to recover was successful
-    Wait Until Keyword Succeeds    30s    5s    Verify Dump Flows Count    ${count_before}    ${table_ids[0]}
-
-ACL Instance Recovery CLI
-    [Documentation]    This test case covers ACL instance recovery.
-    ${count_before} =    Get Dump Flows Count    ${OS_CMP1_CONN_ID}    ${table_ids[1]}
-    ${node_id} =    OVSDB.Get DPID    ${OS_COMPUTE_1_IP}
-    Write Commands Until Expected Prompt    sudo ovs-ofctl del-flows br-int -OOpenflow13 "table=${table_ids[1]},icmp"    ${DEFAULT_LINUX_PROMPT_STRICT}
-    Wait Until Keyword Succeeds    30s    5s    Verify ACL Flows Should Not Contain    ${OS_CMP1_CONN_ID}    ${table_ids[1]}    icmp
-    ${output} =    OpenStack CLI    openstack security group show ${acl_sr_security_group} | awk '/ id / {print $4}'
-    ${splitted_output} =    String.Split String    ${output}    ${EMPTY}
-    ${instance_id} =    Collections.Get from List    ${splitted_output}    0
-    ${output} =    Issue_Command_On_Karaf_Console    srm:recover instance acl-instance ${instance_id}
-    Should Contain    ${output}    RPC call to recover was successful
-    Wait Until Keyword Succeeds    30s    5s    Verify ACL Flows Should Contain    ${OS_CMP1_CONN_ID}    ${table_ids[1]}    icmp
-    Wait Until Keyword Succeeds    30s    5s    Verify Dump Flows Count    ${count_before}    ${table_ids[1]}
-
-ACL Interface Recovery CLI
-    [Documentation]    This test case covers ACL interface recovery.
-    ${output} =    OpenStack CLI    openstack port show ${acl_sr_net_1_ports[0]} |awk '/ mac_address / {print$4}'
-    @{list} =    Split String    ${output}
-    ${port_mac}    Set Variable    ${list[0]}
-    ${count_before} =    Get Dump Flows Count    ${OS_CMP1_CONN_ID}    ${table_ids[2]}    port_mac=${port_mac}
-    ${node_id}    OVSDB.Get DPID    ${OS_COMPUTE_1_IP}
-    Write Commands Until Expected Prompt    sudo ovs-ofctl del-flows br-int -OOpenflow13 "table=${table_ids[2]},dl_dst=${port_mac}"    ${DEFAULT_LINUX_PROMPT_STRICT}
-    Wait Until Keyword Succeeds    30s    5s    Verify ACL Flows Should Not Contain    ${OS_CMP1_CONN_ID}    ${table_ids[2]}    ${port_mac}
-    ${output} =    OpenStack CLI    openstack port show ${acl_sr_net_1_ports[0]} |awk '/ id / {print$4}'
-    ${splitted_output} =    String.Split String    ${output}    ${EMPTY}
-    ${interface_id} =    Collections.Get from List    ${splitted_output}    0
-    ${output} =    Issue_Command_On_Karaf_Console    srm:recover instance acl-interface ${interface_id}
-    Should Contain    ${output}    RPC call to recover was successful
-    Wait Until Keyword Succeeds    30s    5s    Verify ACL Flows Should Contain    ${OS_CMP1_CONN_ID}    ${table_ids[2]}    ${port_mac}
-    Wait Until Keyword Succeeds    30s    5s    Verify Dump Flows Count    ${count_before}    ${table_ids[2]}    port_mac=${port_mac}
-
-*** Keywords ***
-Get Dump Flows Count
-    [Arguments]    ${conn_id}    ${acl_sr_table_id}    &{Kwargs}
-    BuiltIn.Run Keyword If    ${Kwargs}    BuiltIn.Log    ${Kwargs}
-    ${port_mac}    BuiltIn.Run Keyword If    ${Kwargs}    Collections.Pop From Dictionary    ${Kwargs}    port_mac    default=${None}
-    ${cmd} =    BuiltIn.Set Variable    sudo ovs-ofctl dump-flows br-int -OOpenFlow13 | grep table=${acl_sr_table_id}
-    ${cmd} =    BuiltIn.Run Keyword If    '${port_mac}'!='None'    BuiltIn.Catenate    ${cmd}    | grep ${port_mac} | wc -l
-    ...    ELSE    BuiltIn.Catenate    ${cmd} | wc -l
-    SSHLibrary.Switch Connection    ${conn_id}
-    ${output} =    Write Commands Until Expected Prompt    ${cmd}    ${DEFAULT_LINUX_PROMPT_STRICT}
-    @{list} =    Split String    ${output}
-    ${count} =    Set Variable    ${list[0]}
-    [Return]    ${count}
-
-Verify Dump Flows Count
-    [Arguments]    ${count_before}    ${table_id}    &{Kwargs}
-    BuiltIn.Run Keyword If    ${Kwargs}    BuiltIn.Log    ${Kwargs}
-    ${port_mac} =    BuiltIn.Run Keyword If    ${Kwargs}    Collections.Pop From Dictionary    ${Kwargs}    port_mac    default=${None}
-    ${count_after} =    BuiltIn.Run Keyword If    '${port_mac}'!='None'    Get Dump Flows Count    ${OS_CMP1_CONN_ID}    ${table_id}    port_mac=${port_mac}
-    ...    ELSE    Get Dump Flows Count    ${OS_CMP1_CONN_ID}    ${table_id}
-    Should Be Equal As Numbers    ${count_before}    ${count_after}
-
-Verify ACL Flows Should Not Contain
-    [Arguments]    ${conn_id}    ${table_id}    ${acl_var}=${None}
-    SSHLibrary.Switch Connection    ${conn_id}
-    ${output} =    Write Commands Until Expected Prompt    sudo ovs-ofctl dump-flows br-int -OOpenFlow13 | grep table=${table_id}    ${DEFAULT_LINUX_PROMPT_STRICT}
-    BuiltIn.Run Keyword If    '${acl_var}'=='None'    Should Not Contain    ${output}    table=${table_id}
-    ...    ELSE    Should Not Contain    ${output}    ${acl_var}
-
-Verify ACL Flows Should Contain
-    [Arguments]    ${conn_id}    ${table_id}    ${acl_var}=${None}
-    SSHLibrary.Switch Connection    ${conn_id}
-    ${output} =    Write Commands Until Expected Prompt    sudo ovs-ofctl dump-flows br-int -OOpenFlow13 | grep table=${table_id}    ${DEFAULT_LINUX_PROMPT_STRICT}
-    BuiltIn.Run Keyword If    '${acl_var}'=='None'    Should Contain    ${output}    table=${table_id}
-    ...    ELSE    Should Contain    ${output}    ${acl_var}
-
-Start Suite
-    [Documentation]    Basic setup.
-    OpenStackOperations.OpenStack Suite Setup
-    OpenStackOperations.Create Allow All SecurityGroup    ${acl_sr_security_group}
-    OpenStackOperations.Create Network    @{acl_sr_networks}[0]
-    OpenStackOperations.Create SubNet    @{acl_sr_networks}[0]    @{acl_sr_subnets}[0]    ${acl_sr_subnet_cidrs[0]}
-    OpenStackOperations.Create Port    @{acl_sr_networks}[0]    ${acl_sr_net_1_ports[0]}    sg=${acl_sr_security_group}
-    OpenStackOperations.Create Port    @{acl_sr_networks}[0]    ${acl_sr_net_1_ports[1]}    sg=${acl_sr_security_group}
-    BuiltIn.Wait Until Keyword Succeeds    3s    1s    Utils.Check For Elements At URI    ${PORT_URL}    ${acl_sr_net_1_ports}
-    OpenStackOperations.Create Vm Instance With Port On Compute Node    ${acl_sr_net_1_ports[0]}    ${acl_sr_net_1_vms[0]}    ${OS_CMP1_HOSTNAME}    sg=${acl_sr_security_group}
-    OpenStackOperations.Create Vm Instance With Port On Compute Node    ${acl_sr_net_1_ports[1]}    ${acl_sr_net_1_vms[1]}    ${OS_CMP2_HOSTNAME}    sg=${acl_sr_security_group}
index 93e48a6068399d07ee5e057d3f39c7181f4c0154..b556a2b90a90446047bc5fafca7ec78d9be9213f 100644 (file)
@@ -8,4 +8,3 @@ integration/test/csit/suites/netvirt/vpnservice/vpn_basic.robot
 integration/test/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot
 integration/test/csit/suites/netvirt/elan/elan.robot
 integration/test/csit/suites/netvirt/vpnservice/arp_learning.robot
-integration/test/csit/suites/netvirt/AclServiceRecovery/AclServiceRecovery.robot