Remove master-database tag from add-node RPC input

[integration/test.git] / csit / libraries / VpnOperations.robot

diff --git a/csit/libraries/VpnOperations.robot b/csit/libraries/VpnOperations.robot
index c6e478504949daea438fc600d768ec3322d4ab56..46acb22d5e73a2c265d0c072d83b1d5cdd0c2148 100644 (file)
--- a/csit/libraries/VpnOperations.robot
+++ b/csit/libraries/VpnOperations.robot
@@ -5,6 +5,7 @@ Resource          Utils.robot
 Resource          TemplatedRequests.robot
 Resource          KarafKeywords.robot
 Resource          ../variables/Variables.robot
+Resource          ../variables/netvirt/Variables.robot
 Library           Collections
 Library           String
 Library           OperatingSystem
@@ -49,6 +50,16 @@ VPN Get L3VPN
     Log    ${resp}
     [Return]    ${resp}
 
+VPN Get L3VPN ID
+    [Arguments]    ${vrf_id}
+    [Documentation]    Check that sub interface ip has been learnt after ARP request
+    ${resp} =    RequestsLibrary.Get Request    session    ${VPN_REST}
+    BuiltIn.Log    ${resp.content}
+    @{list_any_matches} =    String.Get_Regexp_Matches    ${resp.content}    \"vpn-instance-name\":\"${VPN_INSTANCE_ID}\",.*"vrf-id":"${vrf_id}",\"vpn-id\":(\\d+)    1
+    ${result} =    Evaluate    ${list_any_matches[0]} * 2
+    ${vpn_id_hex} =    BuiltIn.Convert To Hex    ${result}
+    [Return]    ${vpn_id_hex.lower()}
+
 Associate L3VPN To Network
     [Arguments]    &{Kwargs}
     [Documentation]    Associate the created L3VPN to a network-id received as dictionary argument
@@ -99,7 +110,7 @@ ITM Delete Tunnel
 Verify Flows Are Present For L3VPN
     [Arguments]    ${ip}    ${vm_ips}
     [Documentation]    Verify Flows Are Present For L3VPN
-    ${flow_output}=    Run Command On Remote System And Log    ${ip}    sudo ovs-ofctl -O OpenFlow13 dump-flows br-int
+    ${flow_output}=    Run Command On Remote System And Log    ${ip}    sudo ovs-ofctl -O OpenFlow13 dump-flows ${INTEGRATION_BRIDGE}
     Should Contain    ${flow_output}    table=${ODL_FLOWTABLE_L3VPN}
     ${l3vpn_table} =    Get Lines Containing String    ${flow_output}    table=${ODL_FLOWTABLE_L3VPN},
     Log    ${l3vpn_table}
@@ -118,7 +129,7 @@ Verify GWMAC Entry On ODL
 Verify GWMAC Flow Entry Removed From Flow Table
     [Arguments]    ${cnIp}
     [Documentation]    Verify the GWMAC Table, ARP Response table and Dispatcher table.
-    ${flow_output}=    Run Command On Remote System And Log    ${cnIp}    sudo ovs-ofctl -O OpenFlow13 dump-flows br-int
+    ${flow_output}=    Run Command On Remote System And Log    ${cnIp}    sudo ovs-ofctl -O OpenFlow13 dump-flows ${INTEGRATION_BRIDGE}
     Should Contain    ${flow_output}    table=${GWMAC_TABLE}
     ${gwmac_table} =    Get Lines Containing String    ${flow_output}    table=${GWMAC_TABLE}
     Log    ${gwmac_table}
@@ -208,8 +219,8 @@ Verify IPv6 GWMAC Flow Entry On Flow Table
 Verify GWMAC Flow Entry On Flow Table
     [Arguments]    ${cnIp}    ${ipv}=ipv4
     [Documentation]    Verify the GWMAC Table, ARP Response table and Dispatcher table.
-    ${flow_output}=    Run Command On Remote System    ${cnIp}    sudo ovs-ofctl -O OpenFlow13 dump-flows br-int
-    ${group_output}=    Run Command On Remote System    ${cnIp}    sudo ovs-ofctl -O OpenFlow13 dump-groups br-int
+    ${flow_output}=    Run Command On Remote System    ${cnIp}    sudo ovs-ofctl -O OpenFlow13 dump-flows ${INTEGRATION_BRIDGE}
+    ${group_output}=    Run Command On Remote System    ${cnIp}    sudo ovs-ofctl -O OpenFlow13 dump-groups ${INTEGRATION_BRIDGE}
     Should Contain    ${flow_output}    table=${DISPATCHER_TABLE}
     ${dispatcher_table} =    Get Lines Containing String    ${flow_output}    table=${DISPATCHER_TABLE}
     Should Contain    ${dispatcher_table}    goto_table:${GWMAC_TABLE}