From a3c015fa3bfebba69a4227775d80021d34dc1a18 Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Wed, 14 Oct 2015 14:26:38 +0200 Subject: [PATCH] Tidy new tests Change-Id: I8e27097336581debd0c272e770f7167ffc79cbf5 Signed-off-by: Jozef Behran --- csit/libraries/VtnMaKeywords.robot | 4 ++-- .../vtn/VTN_Mgr_OF13/010__vtn_manager_dataflow.robot | 10 +++++----- .../vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot index dd53a0a83b..1678d04ade 100644 --- a/csit/libraries/VtnMaKeywords.robot +++ b/csit/libraries/VtnMaKeywords.robot @@ -94,15 +94,15 @@ Add a portmap Verify Data Flows [Arguments] ${vtn_name} ${vBridge_name} [Documentation] Verify the reason and physical data flows for the specified vtn and vbridge - ${resp}= RequestsLibrary.Get session ${REST_CONTEXT_VTNS}/${vtn_name}/flows/detail + ${resp}= RequestsLibrary.Get session ${REST_CONTEXT_VTNS}/${vtn_name}/flows/detail Run Keyword If '${vBridge_name}' == 'vBridge1' DataFlowsForBridge ${resp} @{BRIDGE1_DATAFLOW} ... ELSE IF '${vBridge_name}' == 'vBridge2' DataFlowsForBridge ${resp} @{BRIDGE2_DATAFLOW} ... ELSE IF '${vBridge_name}' == 'vBridge1_vlan' DataFlowsForBridge ${resp} @{VLANMAP_BRIDGE1_DATAFLOW} ... ELSE DataFlowsForBridge ${resp} @{VLANMAP_BRIDGE2_DATAFLOW} DataFlowsForBridge + [Arguments] ${resp} @{BRIDGE_DATAFLOW} [Documentation] Verify whether the required attributes exists. - [Arguments] ${resp} @{BRIDGE_DATAFLOW} : FOR ${dataflowElement} IN @{BRIDGE_DATAFLOW} \ should Contain ${resp.content} ${dataflowElement} diff --git a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_dataflow.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_dataflow.robot index 90ca2be036..e0d6366498 100644 --- a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_dataflow.robot +++ b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_dataflow.robot @@ -7,15 +7,15 @@ Resource ../../../libraries/VtnMaKeywords.robot *** Test Cases *** Check if switch1 detected [Documentation] Check if openflow:1 is detected - BuiltIn.Wait_Until_Keyword_Succeeds 12 3 Fetch vtn switch inventory openflow:1 + BuiltIn.Wait_Until_Keyword_Succeeds 12 3 Fetch vtn switch inventory openflow:1 Check if switch2 detected [Documentation] Check if openflow:2 is detected - BuiltIn.Wait_Until_Keyword_Succeeds 3 1 Fetch vtn switch inventory openflow:2 + BuiltIn.Wait_Until_Keyword_Succeeds 3 1 Fetch vtn switch inventory openflow:2 Check if switch3 detected [Documentation] Check if openflow:3 is detected - BuiltIn.Wait_Until_Keyword_Succeeds 3 1 Fetch vtn switch inventory openflow:3 + BuiltIn.Wait_Until_Keyword_Succeeds 3 1 Fetch vtn switch inventory openflow:3 Add a vtn Tenant1 [Documentation] Add a vtn Tenant1 @@ -49,7 +49,7 @@ Add a portmap for interface if2 Ping h1 to h3 [Documentation] Ping h1 to h3, verify no packet loss - Mininet Ping Should Succeed h1 h3 + Mininet Ping Should Succeed h1 h3 Verify data flow details For vBridge1 [Documentation] Verify the data flows for the specified tenant and bridge @@ -83,7 +83,7 @@ Add a portmap for interface if4 Ping h2 to h4 [Documentation] Ping h2 to h4, verify no packet loss - Mininet Ping Should Succeed h2 h4 + Mininet Ping Should Succeed h2 h4 Verify data flow details for vBridge2 [Documentation] Verify the data flows for the specified tenant and bridge diff --git a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot index 33a8488438..eec0281a14 100644 --- a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot +++ b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot @@ -7,19 +7,19 @@ Resource ../../../libraries/VtnMaKeywords.robot *** Test Cases *** Start topology [Documentation] Add a vlan topology - Start vlan_topo + Start vlan_topo Check if switch1 detected [Documentation] Check if openflow:1 is detected - BuiltIn.Wait_Until_Keyword_Succeeds 12 3 Fetch vtn switch inventory openflow:1 + BuiltIn.Wait_Until_Keyword_Succeeds 12 3 Fetch vtn switch inventory openflow:1 Check if switch2 detected [Documentation] Check if openflow:2 is detected - BuiltIn.Wait_Until_Keyword_Succeeds 3 1 Fetch vtn switch inventory openflow:2 + BuiltIn.Wait_Until_Keyword_Succeeds 3 1 Fetch vtn switch inventory openflow:2 Check if switch3 detected [Documentation] Check if openflow:3 is detected - BuiltIn.Wait_Until_Keyword_Succeeds 3 1 Fetch vtn switch inventory openflow:3 + BuiltIn.Wait_Until_Keyword_Succeeds 3 1 Fetch vtn switch inventory openflow:3 Add a vtn Tenant1 [Documentation] Add a vtn Tenant1 @@ -66,7 +66,7 @@ Verify data flow details for vlanmap vBridge2_vlan Verify Data Flows Tenant1 vBridge2_vlan Get vlanflow h2 h5 - [Documentation] ping h2 to h5 + [Documentation] ping h2 to h5 Mininet Ping Should Not Succeed h2 h5 Delete a vtn Tenant1 -- 2.36.6