Modify VTN Test files and VTNMgr Keyword file to use RESTCONF instead of the REST API

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

diff --git a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.robot b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbridge_portmapping_test.robot
similarity index 54%
rename from csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.robot
rename to csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbridge_portmapping_test.robot
index 43dde11d6fbe869b774cf1f4e6638d179f310874..e70e363c7fd6da1cfde4241beb448fe539ed9601 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbridge_portmapping_test.robot
@@ -19,67 +19,55 @@ Check if switch3 detected
 
 Add a vtn Tenant1
     [Documentation]    Add a vtn Tenant1
-    Add a vtn    Tenant1    {"description": "Virtual Tenant 1 for Hackfest network"}
+    Add a vtn    Tenant1
 
 Add a vBridge vBridge1
     [Documentation]    Add a vBridge vBridge1 in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge1    {}
+    Add a vBridge    Tenant1    vBridge1
 
 Add a interface If1
-    [Documentation]    Add a interface if1 into vBridge vBrdige1
-    Add a interface    Tenant1    vBridge1    if1    {}
+    [Documentation]    Add a interface if1 into vBridge vBridge1
+    Add a interface    Tenant1    vBridge1    if1
 
 Add a interface if2
-    [Documentation]    Add a interface if2 into vBridge vBrdige1
-    Add a interface    Tenant1    vBridge1    if2    {}
+    [Documentation]    Add a interface if2 into vBridge vBridge1
+    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
+    BuiltIn.Wait_Until_Keyword_Succeeds    20   1    Mininet Ping Should Succeed    h1    h3
 
 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 vBridge vBrdige2
-    Add a interface    Tenant1    vBridge2    if3    {}
+    Add a interface    Tenant1    vBridge2    if3
 
 Add a interface if4
     [Documentation]    Add a interface if4 into vBridge vBrdige2
-    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 vBridge2
-    ${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}
+    [Documentation]    Create a portmap on Interface if3 of vBridge1
+    Add a portmap    Tenant1    vBridge2    if3   openflow:2    s2-eth2
 
 Add a portmap for interface if4
-    [Documentation]    Create a portmap on Interface if4 of vBridge2
-    ${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}
+    [Documentation]    Create a portmap on Interface if4 of vBridge1
+    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
+    BuiltIn.Wait_Until_Keyword_Succeeds    20    1    Mininet Ping Should Succeed    h2    h4
 
 Get flow
     [Documentation]    Get flow of a vtn Tenant1
@@ -92,10 +80,7 @@ Verify FlowMacAddress
 
 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