Modify Vtn Macmapping robot files for VTN Manager RESTCONF

[integration/test.git] / csit / suites / vtn / VTN_Mgr_OF13 / 010__vtn_macmap.robot

diff --git a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_macmap.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_macmap.robot
index c0636adebba68172b6a09215188fa8a70a814853..82d1869e5e4964b26c30c57c762b52f6babcc6ea 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_macmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_macmap.robot
@@ -7,40 +7,33 @@ 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
-    Add a vtn    Tenant1    {}
+    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 macmap for bridge1
     [Documentation]    Add a macmap for bridge1 in vtn Tenant1
     ${source}=    Get DynamicMacAddress    h1
     ${destination}=    Get DynamicMacAddress    h3
-    ${destaddress}=    Create Dictionary    vlan=0    address=${destination}
-    ${sourceaddress}=    Create Dictionary    vlan=0    address=${source}
-    @{machost}    Create List    ${sourceaddress}    ${destaddress}
-    ${mac_map_data}=    Create Dictionary    machost=${machost}
-    Add a vBridgeMacMapping    Tenant1    vBridge1    ${mac_map_data}
-
+    Add a macmap    Tenant1    vBridge1    ${source}    ${destination}
 
 Get macmapflow h3 h1
     [Documentation]    ping h3 to h1
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h3    h1
-
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h3    h1
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1