Modify vlanmap and dataflow robot files for VTN Manager RESTCONF

[integration/test.git] / csit / suites / vtn / VTN_Mgr_OF10 / 010__vtn_manager_dataflow.robot

diff --git a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_dataflow.robot b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_dataflow.robot
index 8c46a4eab6d5500f82e11f0a2943644cd8daed24..376fb8b7f7abc981e79050a8467d179a4476f4d7 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_dataflow.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_dataflow.robot
@@ -2,7 +2,6 @@
 Documentation     Test suite for VTN Manager Data Flow using OF10
 Suite Setup       Start SuiteVtnMaTest
 Suite Teardown    Stop SuiteVtnMaTest
-Force Tags        exclude
 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Test Cases ***
@@ -20,71 +19,59 @@ Check if switch3 detected
 
 Add a vtn Tenant1
     [Documentation]    Add a vtn Tenant1
-    Add a vtn    Tenant1    {"idleTimeout": "200","hardTimeout": "600","description": "Virtual Tenant1 for Hackfest network"}
+    Add a vtn    Tenant1
 
 Add a vBridge vBridge1
     [Documentation]    Add a vBridge vBridge1 in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge1    {"ageInterval": "300","description": "vBridge1 for Tenant1"}
+    Add a vBridge    Tenant1    vBridge1
 
 Add a interface If1
     [Documentation]    Add a interface if1 into vBridge vBridge1
-    Add a interface    Tenant1    vBridge1    if1    {"enabled": "true","description": "Interface1 for vBridge1 for Tenant1"}
+    Add a interface    Tenant1    vBridge1    if1
 
 Add a interface if2
     [Documentation]    Add a interface if2 into vBridge vBridge1
-    Add a interface    Tenant1    vBridge1    if2    {"enabled": "true","description": "Interface2 for vBridge1 for Tenant1"}
+    Add a interface    Tenant1    vBridge1    if2
 
 Add a portmap for interface if1
     [Documentation]    Create a portmap on Interface if1 of vBridge1
-    ${node}    Create Dictionary    type=OF    id=00:00:00:00:00:00:00:02
-    ${port}    Create Dictionary    name=s2-eth1
-    ${portmap_data}    Create Dictionary    node=${node}    port=${port}
-    Add a portmap    Tenant1    vBridge1    if1    ${portmap_data}
+    Add a portmap    Tenant1    vBridge1    if1    openflow:2    s2-eth1
 
 Add a portmap for interface if2
     [Documentation]    Create a portmap on Interface if2 of vBridge1
-    ${node}    Create Dictionary    type=OF    id=00:00:00:00:00:00:00:03
-    ${port}    Create Dictionary    name=s3-eth1
-    ${portmap_data}    Create Dictionary    node=${node}    port=${port}
-    Add a portmap    Tenant1    vBridge1    if2    ${portmap_data}
+    Add a portmap    Tenant1    vBridge1    if2    openflow:3    s3-eth1
 
 Ping h1 to h3
     [Documentation]    Ping h1 to h3, verify no packet loss
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify data flow details For vBridge1
     [Documentation]    Verify the data flows for the specified tenant and bridge
-    Verify Data Flows    Tenant1    vBridge1
+    Wait Until Keyword Succeeds    20s    1s    Verify Data Flows    Tenant1    vBridge1
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge2    {}
+    Add a vBridge    Tenant1    vBridge2
 
 Add a interface If3
     [Documentation]    Add a interface if3 into vBrdige vBridge1
-    Add a interface    Tenant1    vBridge2    if3    {}
+    Add a interface    Tenant1    vBridge2    if3
 
 Add a interface if4
     [Documentation]    Add a interface if4 into vBrdige vBridge1
-    Add a interface    Tenant1    vBridge2    if4    {}
+    Add a interface    Tenant1    vBridge2    if4
 
 Add a portmap for interface if3
     [Documentation]    Create a portmap on Interface if3 of vBridge1
-    ${node}    Create Dictionary    type=OF    id=00:00:00:00:00:00:00:02
-    ${port}    Create Dictionary    name=s2-eth2
-    ${portmap_data}    Create Dictionary    node=${node}    port=${port}
-    Add a portmap    Tenant1    vBridge2    if3    ${portmap_data}
+    Add a portmap    Tenant1    vBridge2    if3    openflow:2    s2-eth2
 
 Add a portmap for interface if4
     [Documentation]    Create a portmap on Interface if4 of vBridge1
-    ${node}    Create Dictionary    type=OF    id=00:00:00:00:00:00:00:03
-    ${port}    Create Dictionary    name=s3-eth2
-    ${portmap_data}    Create Dictionary    node=${node}    port=${port}
-    Add a portmap    Tenant1    vBridge2    if4    ${portmap_data}
+    Add a portmap    Tenant1    vBridge2    if4    openflow:3    s3-eth2
 
 Ping h2 to h4
     [Documentation]    Ping h2 to h4, verify no packet loss
-    Mininet Ping Should Succeed    h2    h4
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Verify data flow details for vBridge2
     [Documentation]    Verify the data flows for the specified tenant and bridge
@@ -92,14 +79,11 @@ Verify data flow details for vBridge2
 
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
-    Verify FlowMacAddress    h2    h4    OF13
+    Wait Until Keyword Succeeds    20s    1s    Verify FlowMacAddress    h2    h4    OF10
 
 Remove Portmap for If1
     [Documentation]    Remove portmap for the interface If1
-    ${node}    Create Dictionary    type=OF    id=00:00:00:00:00:00:00:02
-    ${port}    Create Dictionary    name=s2-eth1
-    ${portmap_data}    Create Dictionary    node=${node}    port=${port}
-    Remove a portmap    Tenant1    vBridge1    if1    ${portmap_data}
+    Remove a portmap    Tenant1    vBridge1    if1
 
 Verify RemovedFlowMacAddress
     [Documentation]    flows will be deleted after the port map is removed