Adding priority to flow mods in TTL suite

-  the reason for this patch is seen in the Flows_OF13/305__ttl.robot
suite.  BUT...

-  using the boyscout rule I've also tried to leave the campsite
a little bit cleaner by removing unneeded lines and using the global
${OPERATIONAL_NODES_API} variable

Change-Id: I66d84f91beba7e8889796dcc2b4a6a0e61f9634c
Signed-off-by: Jamo Luhrsen <james.luhrsen@hp.com>

diff --git a/test/csit/libraries/FlowLib.txt b/test/csit/libraries/FlowLib.txt
index 18d40b9ace08374776da0d342edf95bbe2e29501..1f45089eb70e32fa3f0a77bc4977e2757c514d59 100644 (file)
--- a/test/csit/libraries/FlowLib.txt
+++ b/test/csit/libraries/FlowLib.txt
@@ -5,6 +5,7 @@ Documentation     Keywords used to create/modify flow objects. The object is def
 ...               controller)
 Library           ./FlowLib.py
 Library           XML
+Variables         ../variables/Variables.py
 
 *** Variables ***
 
@@ -193,7 +194,7 @@ Remove Default Flows
     ${resp}    RequestsLibrary.Post    session    restconf/operations/sal-flow:remove-flow    data=${flow.xml}    headers=${headers}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}=    RequestsLibrary.Get    session    ${REST_OPR}
+    ${resp}=    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}
     Log    ${resp.content}
     Should Not Contain    ${resp.content}    "output-node-connector": "CONTROLLER",
     ${strings_to_check_for}=    Create List    CONTROLLER

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot b/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot
index cdc3502f7c5bff7b7084fa7917a32c03ec729f33..4a6871387ba5a4e949e151101640f73650fcbfe9 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f1.xml
 ${FLOW}           124
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot b/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot
index 16cd6d6af031b68c48e457a2f842d43415b295fd..d66172ac35ea99c05ed52217180dc46803a32979 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f2.xml
 ${FLOW}           125
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot b/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot
index 1b61f74b601aca1b35beaa5ed3c12a475cb65419..b8b6258ff35cec65e1181bf0dc65cdadffa4c9cf 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f3.xml
 ${FLOW}           126
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot b/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot
index 2177cecd50a695f1b5fd39844478d8a91563b8c0..fc7396ce9de6e4efa39f53f591055d336fc895db 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f5.xml
 ${FLOW}           128
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot b/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
index 8420815d948e94c4b6bbf61637b97a7a25707ab0..5700c7e7559af50989993b3e75814993430cf32b 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
@@ -15,15 +15,14 @@ Library           SSHLibrary
 Library           Collections
 Library           OperatingSystem
 Library           String
+Library           RequestsLibrary
 Library           XML
 Resource          ../../../libraries/FlowLib.txt
-Library           ../../../libraries/RequestsLibrary.py
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${GENERIC_ACTION_FLOW_FILE}    ${CURDIR}/../../../variables/xmls/genericActionFlow.xml
 ${ipv4_src}       10.1.2.0/24
 ${ipv4_dst}       40.4.0.0/16
@@ -38,35 +37,35 @@ ${copy_ttl_out_doc}    OFPAT_COPY_TTL_OUT = 11, /* Copy TTL "outwards" -- from n
 ${set_mpls_ttl_doc}    OFPAT_SET_MPLS_TTL = 15, /* MPLS TTL */
 ${dec_mpls_ttl_doc}    OFPAT_DEC_MPLS_TTL = 16, /* Decrement MPLS TTL */
 
-*** Test Cases ***    ODL flow action        action key             action value    tableID    flowID    verify OVS?    OVS specific string?
+*** Test Cases ***    ODL flow action        action key             action value    tableID    flowID    priority    verify OVS?    OVS specific string?
 Set_IP_TTL            [Documentation]        ${set_ip_ttl_doc}
                       [Tags]                 ttl                    set
-                      set-nw-ttl-action      nw-ttl                 1               2          101       no             set_ttl
+                      set-nw-ttl-action      nw-ttl                 1               2          101       10          no             set_ttl
 
 Dec_TTL               [Documentation]        ${dec_ttl_doc}
                       [Tags]                 ttl                    dec
-                      dec-nw-ttl             none                   none            3          305       yes            dec_ttl
+                      dec-nw-ttl             none                   none            3          305       311          yes            dec_ttl
 
 Copy_TTL_In           [Documentation]        ${copy_ttl_in_doc}
                       [Tags]                 ttl                    copyin
-                      copy-ttl-in            none                   none            9          202       no             copy_ttl_in
+                      copy-ttl-in            none                   none            9          202       9          no             copy_ttl_in
 
 Copy_TTL_Out          [Documentation]        ${copy_ttl_out_doc}
                       [Tags]                 ttl                    copyout
-                      copy-ttl-out           none                   none            8          909       no             copy_ttl_out
+                      copy-ttl-out           none                   none            8          909       4242          no             copy_ttl_out
 
 Set_MPLS_TTL          [Documentation]        ${set_mpls_ttl_doc}
                       [Tags]                 ttl                    setmpls
-                      set-mpls-ttl-action    mpls-ttl               1               4          505       yes            set_mpls_ttl
+                      set-mpls-ttl-action    mpls-ttl               1               4          505       9021          yes            set_mpls_ttl
 
 Dec_MPLS_TTL          [Documentation]        ${dec_mpls_ttl_doc}
                       [Tags]                 ttl                    decmpls
-                      dec-mpls-ttl           none                   none            2          1001      yes            dec_mpls_ttl
+                      dec-mpls-ttl           none                   none            2          1001      81          yes            dec_mpls_ttl
 
 *** Keywords ***
 Create And Remove Flow
-    [Arguments]    ${flow_action}    ${action_key}    ${action_value}    ${table_id}    ${flow_id}    ${verify_switch_flag}
-    ...    ${additional_ovs_flowelements}
+    [Arguments]    ${flow_action}    ${action_key}    ${action_value}    ${table_id}    ${flow_id}    ${priority}
+    ...    ${verify_switch_flag}    ${additional_ovs_flowelements}
     @{OVS_FLOWELEMENTS}    Create List    dl_dst=${eth_dst}    table=${table_id}    dl_src=${eth_src}    nw_src=${ipv4_src}    nw_dst=${ipv4_dst}
     ...    ${additional_ovs_flowelements}
     ##The dictionaries here will be used to populate the match and action elements of the flow mod
@@ -76,6 +75,7 @@ Create And Remove Flow
     ${flow}=    Create Inventory Flow
     Set "${flow}" "table_id" With "${table_id}"
     Set "${flow}" "id" With "${flow_id}"
+    Set "${flow}" "priority" With "${priority}"
     Clear Flow Actions    ${flow}
     Set Flow Action    ${flow}    0    0    ${flow_action}
     Set Flow Ethernet Match    ${flow}    ${ethernet_match_dict}

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot b/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot
index 0df55e402e8c2e5cf5dc347dbc9b7ab082cb5df6..2c85f6f791a1c767d30a68af861a0e507437e703 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f7.xml
 ${FLOW}           130
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot b/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot
index 6683e049330f043bf2f760c8983b72855813cba3..76fe504b05762531b0c6011ad200e2e4e38b573d 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f8.xml
 ${FLOW}           131
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot b/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot
index 1c0cc7dc770c9741df11bf15d3a07d7de27be14d..ebe6332072bb92e1b3ff5e01b70130698f8093b7 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f9.xml
 ${FLOW}           132
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot b/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot
index c2504eef1c883af95e0b16eac6c2de171d9c4349..ad2e0bc8564f40dbae538db1ff931dcaea530a95 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f10.xml
 ${FLOW}           133
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot b/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot
index 25a9e410e0efb8b67a7d5d385a7b1b491435b893..6d353f366236a9bf33d77a3a66d93f4c37a9040b 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f11.xml
 ${FLOW}           134
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot b/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot
index 104277ec99c6bf342e92c4b537a5acb1baf8fc46..d4fb185e78a977847878158e4e60a5356ac7292c 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f12.xml
 ${FLOW}           135
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot b/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot
index 410538c05d3368d65db4356a7b7056f3a956879c..3985e03e468d2285239c26af84623a92b2241afc 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f13.xml
 ${FLOW}           136
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot b/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot
index ca10e535a952947875f664bb5e718dc57066b0b5..050c41df6fe704662caeeb1c2a476639618adf56 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f14.xml
 ${FLOW}           137
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot b/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot
index 4e7cddd9bb454b1f9670974c5c5800a66492ceb9..8947ec545ce3cc82cf521a49556e461ead7d9bc0 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f15.xml
 ${FLOW}           138
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot b/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
index d2c2990caa8f5e5b5c63bdf725bafc7db3c9fba2..429d02df5969de6de975193a42d3dd3cc55b87e1 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f16.xml
 ${FLOW}           139
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot b/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot
index 8ace0905879a5e82137670e640928bb4e9fc0957..4e695bba4a0439775f8dd540665ca62ef1f3a2fa 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f17.xml
 ${FLOW}           140
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot b/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot
index fb31499040300e2c3a3493e7c89af55ae9666cd1..6a93e9a8df0157dbd29d889b577234c1a3384e68 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f18.xml
 ${FLOW}           141
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot b/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot
index 84084bd9f69746265dfd4405fe74e929b9213887..be7a3ca93af942e57c09e02c8ce9a9ad49d69430 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f19.xml
 ${FLOW}           142
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot b/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
index e0ebe04f21590e371b4b16ab0fb46da8b8f62056..e124a60769df10812927c7c06e04d1873740df14 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f20.xml
 ${FLOW}           143
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot b/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot
index 460bb8f5e1ff0336e3c88b3c55a5dc76c6c7de0c..a0fb6c99b77753ec8294a715bec1f70cad372fdc 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f21.xml
 ${FLOW}           144
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot b/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot
index 887e5858f04954515f8bb7d93b43298237abb6e6..632b57a929cf0f13c9d7f9b00f86e6fd34c64728 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f22.xml
 ${FLOW}           145
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot b/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot
index a633e285cccca31505efc01b760ed43c447a3d80..4d628d3031c73fd5393de8b80bf2139970b8acf3 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f23.xml
 ${FLOW}           146
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot b/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot
index 702e999a5de1b713a2d60c2c0b8e3e831a45030b..8495d845e9e0f367f652b653e570987e0d236f8c 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f24.xml
 ${FLOW}           147
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot b/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot
index ac1fa4b743c829c3dd2b3676705189a37f5bd6f4..7cacb1a42c05faeb11af990974c06a09824c6b35 100644 (file)
--- a/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot
+++ b/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot
@@ -11,7 +11,6 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f25.xml
 ${FLOW}           148
 ${TABLE}          2

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot
index b3daa30c56c9b41c157704f3652409195c41f051..b7c21e09bded49a50b4d7135828653de469f062e 100644 (file)
--- a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot
+++ b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot
@@ -10,7 +10,6 @@ Resource          ../../../libraries/Utils.txt
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${BODY2}          <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.20.1/32</ipv4-destination></match><id>152</id><table_id>0</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><output-action><output-node-connector>openflow:1:1</output-node-connector></output-action></action></apply-actions></instruction></instructions></flow>
 
 *** Test Cases ***
@@ -28,7 +27,7 @@ Verify after adding flow config - Output to physical port#
 Verify after adding flow operational - Output to physical port#
     [Documentation]    Verify the flow
     ${elements}=    Create List    10.0.20.1
-    Wait Until Keyword Succeeds    60s    2s    Check For Elements At URI    ${REST_OPR}/node/openflow:1/table/0    ${elements}
+    Wait Until Keyword Succeeds    60s    2s    Check For Elements At URI    ${OPERATIONAL_NODES_API}/node/openflow:1/table/0    ${elements}
 
 Remove a flow - Output to physical port#
     [Documentation]    Remove a flow
@@ -45,4 +44,4 @@ Verify after deleting flow config - Output to physical port#
 Verify after deleting flow operational - Output to physical port#
     [Documentation]    Verify the flow
     ${elements}=    Create List    10.0.20.1
-    Wait Until Keyword Succeeds    60s    2s    Check For Elements Not At URI    ${REST_OPR}/node/openflow:1/table/0    ${elements}
+    Wait Until Keyword Succeeds    60s    2s    Check For Elements Not At URI    ${OPERATIONAL_NODES_API}/node/openflow:1/table/0    ${elements}

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot
index 214186ec27038bd57c9ce3aed6b1e09aa021cd58..aadba3ebca11d7957ac9461654a4a2714688e127 100644 (file)
--- a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot
+++ b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot
@@ -10,7 +10,6 @@ Resource          ../../../libraries/Utils.txt
 
 *** Variables ***
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${BODY1}          <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.10.1/32</ipv4-destination></match><id>139</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><dec-nw-ttl/></action></apply-actions></instruction></instructions></flow>
 ${BODY2}          <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.20.1/32</ipv4-destination></match><id>139</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><output-action><output-node-connector>1</output-node-connector><max-length>60</max-length></output-action></action></apply-actions></instruction></instructions></flow>
 
@@ -29,7 +28,7 @@ Verify after adding flow config - Sending IPv4 Dest Address and Eth type
 Verify after adding flow operational - Sending IPv4 Dest Address and Eth type
     [Documentation]    Verify the flow
     ${elements}=    Create List    10.0.10.1
-    Wait Until Keyword Succeeds    60s    2s    Check For Elements At URI    ${REST_OPR}/node/openflow:1/table/2    ${elements}
+    Wait Until Keyword Succeeds    60s    2s    Check For Elements At URI    ${OPERATIONAL_NODES_API}/node/openflow:1/table/2    ${elements}
 
 Modify a flow - Output to physical port#
     [Documentation]    Push a flow through REST-API
@@ -45,7 +44,7 @@ Verify after modifying flow config - Output to physical port#
 Verify after modifying flow operational - Output to physical port#
     [Documentation]    Verify the flow
     ${elements}=    Create List    10.0.20.1
-    Wait Until Keyword Succeeds    90s    2s    Check For Elements At URI    ${REST_OPR}/node/openflow:1/table/2/flow/139    ${elements}
+    Wait Until Keyword Succeeds    90s    2s    Check For Elements At URI    ${OPERATIONAL_NODES_API}/node/openflow:1/table/2/flow/139    ${elements}
 
 Remove a flow - Output to physical port#
     [Documentation]    Remove a flow
@@ -61,4 +60,4 @@ Verify after deleting flow config - Output to physical port#
 Verify after deleting flow operational - Output to physical port#
     [Documentation]    Verify the flow
     ${elements}=    Create List    10.0.20.1
-    Wait Until Keyword Succeeds    60s    2s    Check For Elements Not At URI    ${REST_OPR}/node/openflow:1/table/2    ${elements}
+    Wait Until Keyword Succeeds    60s    2s    Check For Elements Not At URI    ${OPERATIONAL_NODES_API}/node/openflow:1/table/2    ${elements}

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot b/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
index 4a543f8ad5510709cf575a0a7ea5688e77e2a624..8cdf6f7b8bd88ea33eda99067428ed6169a6dba3 100644 (file)
--- a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
+++ b/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
@@ -30,7 +30,6 @@ ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
 ${CONTROLLER}     null
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
-${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${ipv4_src}       11.3.0.0/16
 ${ipv4_dst}       99.0.0.0/8
 ${eth_type}       0x800