From d53fd133ccab79be2dabac530c44af8c3de17b43 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Thu, 15 Nov 2018 22:29:45 -0800 Subject: [PATCH] Use OS_CMP format for compute ips The devstackutils library now will generate proper ips for our OS_CMP1_IP and OS_CMP2_IP variables depending on the deployment. In the case of an all-in-one deployment the CMP1 and CMP2 ips are going to be the same. That was done for all other suites back when we moved to this method, but I think elan was missed somehow. example of how it fails: https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-fluorine/116/robot-plugin/log_full.html.gz#s1-s11-k1-k2-k7-k1-k5-k3-k1 you can see that the ssh session had no destination ip listed, because that variable used was not available Change-Id: I3cb2f63828bad2ee1fd4f3a03ce08eab30159295 Signed-off-by: Jamo Luhrsen --- .../netvirt/elan/elan_service_recovery.robot | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/csit/suites/netvirt/elan/elan_service_recovery.robot b/csit/suites/netvirt/elan/elan_service_recovery.robot index 0eb81c56cd..916a361f90 100644 --- a/csit/suites/netvirt/elan/elan_service_recovery.robot +++ b/csit/suites/netvirt/elan/elan_service_recovery.robot @@ -32,8 +32,8 @@ ${NUM_OF_PORTS_PER_HOST} 2 *** Test Cases *** To Verify ELAN Service Recovery [Documentation] To Verify Elan Service recovery by deleting and recovering multiple flows - OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_1_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] actions=goto_table:${ELAN_DMACTABLE} - OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_2_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[2] actions=goto_table:${ELAN_DMACTABLE} + OVSDB.Verify Dump Flows For Specific Table ${OS_CMP1_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] actions=goto_table:${ELAN_DMACTABLE} + OVSDB.Verify Dump Flows For Specific Table ${OS_CMP2_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[2] actions=goto_table:${ELAN_DMACTABLE} ${flow_id} = FlowLib.Get Flow Id ${DPNID_1} ${ELAN_SMAC_TABLE} @{PORT_MAC_ADDR}[0] FlowLib.Delete Flow Via Restconf ${DPNID_1} ${ELAN_SMAC_TABLE} ${flow_id} ${flow_id} = FlowLib.Get Flow Id ${DPNID_2} ${ELAN_SMAC_TABLE} @{PORT_MAC_ADDR}[2] @@ -42,13 +42,13 @@ To Verify ELAN Service Recovery Utils.Check For Elements Not At URI ${CONFIG_NODES_API}/node/openflow:${DPNID_1}/table/${ELAN_SMAC_TABLE} ${mac_elements} ${mac_elements} = BuiltIn.Create List @{PORT_MAC_ADDR}[2] Utils.Check For Elements Not At URI ${CONFIG_NODES_API}/node/openflow:${DPNID_2}/table/${ELAN_SMAC_TABLE} ${mac_elements} - BuiltIn.Wait Until Keyword Succeeds 10s 5s OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_1_IP} ${ELAN_SMAC_TABLE} False + BuiltIn.Wait Until Keyword Succeeds 10s 5s OVSDB.Verify Dump Flows For Specific Table ${OS_CMP1_IP} ${ELAN_SMAC_TABLE} False ... ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] - BuiltIn.Wait Until Keyword Succeeds 10s 5s OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_2_IP} ${ELAN_SMAC_TABLE} False + BuiltIn.Wait Until Keyword Succeeds 10s 5s OVSDB.Verify Dump Flows For Specific Table ${OS_CMP2_IP} ${ELAN_SMAC_TABLE} False ... ${EMPTY} dl_src=@{PORT_MAC_ADDR}[2] KarafKeywords.Issue Command On Karaf Console ${SERVICE-STATUS-CLI} - OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_1_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] actions=goto_table:${ELAN_DMACTABLE} - OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_2_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[2] actions=goto_table:${ELAN_DMACTABLE} + OVSDB.Verify Dump Flows For Specific Table ${OS_CMP1_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] actions=goto_table:${ELAN_DMACTABLE} + OVSDB.Verify Dump Flows For Specific Table ${OS_CMP2_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[2] actions=goto_table:${ELAN_DMACTABLE} ${mac_elements} = BuiltIn.Create List @{PORT_MAC_ADDR}[0] Utils.Check For Elements At URI ${CONFIG_NODES_API}/node/openflow:${DPNID_1}/table/${ELAN_SMAC_TABLE} ${mac_elements} ${mac_elements} = BuiltIn.Create List @{PORT_MAC_ADDR}[2] @@ -56,20 +56,20 @@ To Verify ELAN Service Recovery To Verify Elan Interface recovery [Documentation] To Verify the Elan Interface recovery by deleting single Flow - BuiltIn.Wait Until Keyword Succeeds 60s 15s OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_1_IP} ${ELAN_SMAC_TABLE} True + BuiltIn.Wait Until Keyword Succeeds 60s 15s OVSDB.Verify Dump Flows For Specific Table ${OS_CMP1_IP} ${ELAN_SMAC_TABLE} True ... ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] actions=goto_table:${ELAN_DMACTABLE} ${flow_id} = FlowLib.Get Flow Id ${DPNID_1} ${ELAN_SMAC_TABLE} @{PORT_MAC_ADDR}[0] FlowLib.Delete Flow Via Restconf ${DPNID_1} ${ELAN_SMAC_TABLE} ${flow_id} ${mac_elements} = BuiltIn.Create List @{PORT_MAC_ADDR}[0] Utils.Check For Elements Not At URI ${CONFIG_NODES_API}/node/openflow:${DPNID_1}/table/${ELAN_SMAC_TABLE} ${mac_elements} - BuiltIn.Wait Until Keyword Succeeds 60s 15s OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_1_IP} ${ELAN_SMAC_TABLE} False + BuiltIn.Wait Until Keyword Succeeds 60s 15s OVSDB.Verify Dump Flows For Specific Table ${OS_CMP1_IP} ${ELAN_SMAC_TABLE} False ... ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] ${elan_instance_id} = Get Elan Instance ID ${elan_interface_id} = Get Elan Interfaces ID ${elan_instance_id} @{PORT_MAC_ADDR}[0] Recover Elan Flows ${elan_interface_id} ${mac_elements} = BuiltIn.Create List @{PORT_MAC_ADDR}[0] BuiltIn.Wait Until Keyword Succeeds 10s 5s Utils.Check For Elements At URI ${CONFIG_NODES_API}/node/openflow:${DPNID_1}/table/${ELAN_SMAC_TABLE} ${mac_elements} - OVSDB.Verify Dump Flows For Specific Table ${OS_COMPUTE_1_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] actions=goto_table:${ELAN_DMACTABLE} + OVSDB.Verify Dump Flows For Specific Table ${OS_CMP1_IP} ${ELAN_SMAC_TABLE} True ${EMPTY} dl_src=@{PORT_MAC_ADDR}[0] actions=goto_table:${ELAN_DMACTABLE} *** Keywords *** Start Suite @@ -108,8 +108,8 @@ Create Setup OpenStackOperations.Create Allow All SecurityGroup ${SECURITY_GROUP} Create Neutron Ports Create Nova VMs ${2} - ${DPNID_1} = OVSDB.Get DPID ${OS_COMPUTE_1_IP} - ${DPNID_2} = OVSDB.Get DPID ${OS_COMPUTE_2_IP} + ${DPNID_1} = OVSDB.Get DPID ${OS_CMP1_IP} + ${DPNID_2} = OVSDB.Get DPID ${OS_CMP2_IP} BuiltIn.Set Suite Variable ${DPNID_1} BuiltIn.Set Suite Variable ${DPNID_2} -- 2.36.6