From: Karthik.S <siva-karthik@hcl.com>
Date: Wed, 23 Dec 2015 18:35:32 +0000 (+0530)
Subject: Modify Vtn Macmapping robot files for VTN Manager RESTCONF
X-Git-Tag: release/beryllium-sr1~229
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e53584de57114e54b982f322467ca4fd6d93807c;p=integration%2Ftest.git

Modify Vtn Macmapping robot files for VTN Manager RESTCONF

    * Removed Force tags "exclude" in 010__vtn_macmap.robot(OF10 and OF13)files
    * Modify test case to work for RESTCONF feature, earlier test was written for RESTAPI spec.
    * Modify VtnMaKeyword.robot file for macmapping functioanlity

Change-Id: I9179f5ce73b9460651f73ebd28d0befc228a34ce
Signed-off-by: Karthik.S <siva-karthik@hcl.com>
---

diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot
index b3d8b4922f..05321af56c 100644
--- a/csit/libraries/VtnMaKeywords.robot
+++ b/csit/libraries/VtnMaKeywords.robot
@@ -176,9 +176,9 @@ Verify flowEntryPathPolicy
     Should Contain    ${result}    in_port=${port}    actions=${output}
 
 Add a macmap
-    [Arguments]    ${vtn_name}    ${vBridge_name}    ${macmap_data}
+    [Arguments]    ${vtn_name}    ${vBridge_name}    ${src_add}    ${dst_add}
     [Documentation]    Create a macmap for a vbridge
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-mac-map:set-mac-map    data={"input": { "allowed-hosts": ["${macmap_data}"], "tenant-name":${vtn_name}, "bridge-name": ${vBridge_name}}}    }
+    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-mac-map:set-mac-map    data={"input":{"operation":"SET","allowed-hosts":["${dst_add}@0","${src_add}@0"],"tenant-name":"${vtn_name}","bridge-name":"${vBridge_name}"}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Get DynamicMacAddress
diff --git a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_macmap.robot b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_macmap.robot
index 2f56ba2c72..82d1869e5e 100644
--- a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_macmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_macmap.robot
@@ -2,7 +2,6 @@
 Documentation     Test suite for VTN Manager using OF13
 Suite Setup       Start SuiteVtnMaTest
 Suite Teardown    Stop SuiteVtnMaTest
-Force Tags        exclude
 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Test Cases ***
@@ -20,25 +19,21 @@ Check if switch3 detected
 
 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
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 2f56ba2c72..82d1869e5e 100644
--- a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_macmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_macmap.robot
@@ -2,7 +2,6 @@
 Documentation     Test suite for VTN Manager using OF13
 Suite Setup       Start SuiteVtnMaTest
 Suite Teardown    Stop SuiteVtnMaTest
-Force Tags        exclude
 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Test Cases ***
@@ -20,25 +19,21 @@ Check if switch3 detected
 
 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