X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FFlowLib.robot;h=d58f9bc8c097e63cbb8b94f01e308d44dfacad4f;hb=HEAD;hp=7a8a9241d26137e7b6d57922f0dbfcbfc08fb953;hpb=f053068a1e68891b98a06a677d84c589576eed37;p=integration%2Ftest.git

diff --git a/csit/libraries/FlowLib.robot b/csit/libraries/FlowLib.robot
index 7a8a9241d2..d58f9bc8c0 100644
--- a/csit/libraries/FlowLib.robot
+++ b/csit/libraries/FlowLib.robot
@@ -1,35 +1,181 @@
 *** Settings ***
-Documentation     Keywords used to create/modify flow objects. The object is defined in the
-...               corresponding FlowLib.py library and contains pertinent fields and methods (e.g.,
-...               cookie and barrier fields, string formatted xml that can be used to push to
-...               controller)
-Library           ./FlowLib.py
-Library           XML
-Library           RequestsLibrary
-Variables         ../variables/Variables.py
+Documentation       Keywords used to create/modify flow objects. The object is defined in the
+...                 corresponding FlowLib.py library and contains pertinent fields and methods (e.g.,
+...                 cookie and barrier fields, string formatted xml that can be used to push to
+...                 controller). TODO: Remove hard dependency on controller HTTP "session".
+
+Library             OperatingSystem
+Library             RequestsLibrary
+Library             String
+Library             XML
+Library             Common.py
+Library             FlowLib.py
+Library             ScaleClient.py
+Library             XmlComparator.py
+Resource            CompareStream.robot
+Resource            TemplatedRequests.robot
+Resource            ../variables/openflowplugin/Variables.robot
+Variables           ../variables/Variables.py
 
-*** Variables ***
 
 *** Keywords ***
+Check No Switches In Inventory
+    [Documentation]    Check no switch is in inventory
+    [Arguments]    ${switches}
+    ${resp}=    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${RFC8040_OPERATIONAL_NODES_API}
+    ...    expected_status=200
+    Log    ${resp.text}
+    FOR    ${switch}    IN RANGE    1    ${switches+1}
+        Should Not Contain    ${resp.text}    "openflow:${switch}"
+    END
+
+Check No Switches In Topology
+    [Documentation]    Check no switch is in topology
+    [Arguments]    ${switches}
+    ${resp}=    RequestsLibrary.GET On Session    session    url=${RFC8040_OPERATIONAL_TOPO_API}    expected_status=200
+    Log    ${resp.text}
+    FOR    ${switch}    IN RANGE    1    ${switches+1}
+        Should Not Contain    ${resp.text}    openflow:${switch}
+    END
+
+Check Switches In Inventory
+    [Documentation]    Check all switches and stats in operational inventory
+    [Arguments]    ${switches}
+    FOR    ${switch}    IN RANGE    1    ${switches+1}
+        ${resp}=    RequestsLibrary.GET On Session
+        ...    session
+        ...    url=${RFC8040_NODES_API}/node=openflow%3A${switch}
+        ...    expected_status=200
+        Log    ${resp.text}
+        Should Contain    ${resp.text}    flow-capable-node-connector-statistics
+        Should Contain    ${resp.text}    flow-table-statistics
+    END
+
+Check Switches In Topology
+    [Documentation]    Check switches are in the topology.
+    [Arguments]    ${switches}
+    ${resp}=    RequestsLibrary.GET On Session    session    url=${RFC8040_OPERATIONAL_TOPO_API}    expected_status=200
+    Log    ${resp.text}
+    ${count}=    Get Count    ${resp.text}    "node-id":"openflow:
+    BuiltIn.Should Be Equal As Numbers    ${count}    ${switches}
+
+Check Number Of Links
+    [Documentation]    Check number of links in the topolgy.
+    [Arguments]    ${links}
+    ${resp}=    RequestsLibrary.GET On Session    session    url=${RFC8040_OPERATIONAL_TOPO_API}    expected_status=200
+    Log    ${resp.text}
+    ${count}=    Get Count    ${resp.text}    "link-id":"openflow:
+    Should Be Equal As Integers    ${count}    ${links}
+
+Check Linear Topology
+    [Documentation]    Check Linear topology.
+    [Arguments]    ${switches}
+    ${resp}=    RequestsLibrary.GET On Session    session    url=${RFC8040_OPERATIONAL_TOPO_API}    expected_status=200
+    Log    ${resp.text}
+    FOR    ${switch}    IN RANGE    1    ${switches+1}
+        Should Contain    ${resp.text}    "node-id":"openflow:${switch}"
+        Should Contain    ${resp.text}    "tp-id":"openflow:${switch}:1"
+        Should Contain    ${resp.text}    "tp-id":"openflow:${switch}:2"
+        Should Contain    ${resp.text}    "source-tp":"openflow:${switch}:2"
+        Should Contain    ${resp.text}    "dest-tp":"openflow:${switch}:2"
+        ${edge}=    Evaluate    ${switch}==1 or ${switch}==${switches}
+        IF    not ${edge}
+            Should Contain    ${resp.text}    "tp-id":"openflow:${switch}:3"
+        END
+        IF    not ${edge}
+            Should Contain    ${resp.text}    "source-tp":"openflow:${switch}:3"
+        END
+        IF    not ${edge}
+            Should Contain    ${resp.text}    "dest-tp":"openflow:${switch}:3"
+        END
+    END
+
+Check Flows Operational Datastore
+    [Documentation]    Check if number of Operational Flows on member of given index is equal to ${flow_count}.
+    [Arguments]    ${flow_count}    ${controller_ip}=${ODL_SYSTEM_IP}
+    ${sw}    ${reported_flow}    ${found_flow}=    ScaleClient.Flow Stats Collected    controller=${controller_ip}
+    Should_Be_Equal_As_Numbers    ${flow_count}    ${found_flow}
+
+Check Number Of Flows
+    [Documentation]    Check number of flows in the inventory.
+    [Arguments]    ${flows}
+    ${resp}=    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${RFC8040_OPERATIONAL_NODES_API}
+    ...    expected_status=200
+    Log    ${resp.text}
+    ${count}=    Get Count    ${resp.text}    "priority"
+    Should Be Equal As Integers    ${count}    ${flows}
+
+Check Number Of Groups
+    [Documentation]    Check number of groups in the inventory.
+    [Arguments]    ${groups}
+    ${resp}=    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${RFC8040_OPERATIONAL_NODES_API}
+    ...    expected_status=200
+    Log    ${resp.text}
+    ${group_count}=    Get Count    ${resp.text}    "group-type"
+    Should Be Equal As Integers    ${group_count}    ${groups}
+
 Check Flow Stats Are Available
+    [Documentation]    A GET on the /node=${node_id} inventory API is made and flow stats string is checked for existence.
     [Arguments]    ${node_id}    ${flows}
-    [Documentation]    A GET on the /node/${node_id} inventory API is made and flow stats string is checked for existence.
-    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}/node/${node_id}/table/2
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    Should Contain X Times    ${resp.content}    priority    ${flows}
+    ${resp}=    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:table=2
+    ...    expected_status=200
+    Log    ${resp.text}
+    Should Contain X Times    ${resp.text}    priority    ${flows}
+
+Check Number Of Hosts
+    [Documentation]    Check number of hosts in topology
+    [Arguments]    ${hosts}
+    ${resp}=    RequestsLibrary.GET On Session    session    url=${RFC8040_OPERATIONAL_TOPO_API}    expected_status=200
+    Log    ${resp.text}
+    ${count}=    Get Count    ${resp.text}    "node-id":"host:
+    Should Be Equal As Integers    ${count}    ${hosts}
+
+Check No Hosts
+    [Documentation]    Check if all hosts are deleted from inventory
+    ${resp}=    RequestsLibrary.GET On Session    session    url=${RFC8040_OPERATIONAL_TOPO_API}    expected_status=200
+    Should Not Contain    ${resp.text}    "node-id":"host:
+
+Add Table Miss Flows
+    [Documentation]    Add table miss flows to switches.
+    [Arguments]    ${switches}
+    ${switches}=    Convert To Integer    ${switches}
+    ${data}=    OperatingSystem.Get File    ${CURDIR}/../variables/openflowplugin/table_miss_flow.json
+    FOR    ${switch}    IN RANGE    1    ${switches+1}
+        TemplatedRequests.Put As Json To Uri
+        ...    ${RFC8040_NODES_API}/node=openflow%3A${switch}/flow-node-inventory:table=0/flow=default
+        ...    ${data}
+        ...    session
+    END
+
+Check Table Miss Flows
+    [Documentation]    Check table miss flows in switches.
+    [Arguments]    ${switches}
+    ${switches}=    Convert To Integer    ${switches}
+    FOR    ${switch}    IN RANGE    1    ${switches+1}
+        TemplatedRequests.Get As Json From Uri
+        ...    ${RFC8040_NODES_API}/node=openflow%3A${switch}/flow-node-inventory:table=0/flow=default
+        ...    session
+    END
 
 Create Inventory Flow
     [Documentation]    Calls FlowLib.Make_Inventory_Flow function and initializes and sanitizes
     ...    the basic flow elements that can be given to flow:inventory
     ${flow}=    Make Inventory Flow
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Create Service Flow
     [Documentation]    Used for creating an object that will use an XML format that
     ...    can be given to flow:service.
     ${flow}=    Make Service Flow
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Set "${flow}" "${property}" With "${property_val}"
     [Documentation]    Embedded variables to make higher level keywords more readable.
@@ -41,17 +187,20 @@ Set "${flow}" "${property}" With "${property_val}"
     ...    xml representation of the flow and reset with the given value. \ It's not
     ...    possible, yet, to have multiple elements with the same name. \ That will
     ...    likely be needed in the future.
-    ${property}    Run Keyword If    "table_id" != "${property}" and "cookie_mask" != "${property}"    Replace String    ${property}    _    -
-    ...    ELSE    Set Variable    ${property}
+    IF    "table_id" != "${property}" and "cookie_mask" != "${property}"
+        ${property}=    Replace String    ${property}    _    -
+    ELSE
+        ${property}=    Set Variable    ${property}
+    END
     Remove Flow XML Element    ${flow}    ${property}
     Add Flow XML Element    ${flow}    ${property}    ${property_val}
     Set Flow Field    ${flow}    ${property}    ${property_val}
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Set Flow Action
-    [Arguments]    ${flow}    ${instruction_order}    ${action_order}    ${action}    ${action_val}=${EMPTY}
     [Documentation]    Will remove the instruction element first, then add the proper xml structure
     ...    to implement the action as given in the arguments
+    [Arguments]    ${flow}    ${instruction_order}    ${action_order}    ${action}    ${action_val}=${EMPTY}
     ##For the case that any of the instruction/apply-actions/action elements are not there we need to add them'
     Remove Flow XML Element    ${flow}    instruction
     Add Flow XML Element    ${flow}    instruction    ${EMPTY}    instructions
@@ -60,19 +209,23 @@ Set Flow Action
     Add Flow XML Element    ${flow}    action    ${EMPTY}    instructions/instruction/apply-actions
     Add Flow XML Element    ${flow}    order    ${action_order}    instructions/instruction/apply-actions/action
     Add Flow XML Element    ${flow}    ${action}    ${action_val}    instructions/instruction/apply-actions/action
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Set Flow Output Action
     [Arguments]    ${flow}    ${instruction_order}    ${action_order}    ${output_port}
     Set Flow Action    ${flow}    ${instruction_order}    ${action_order}    output-action
-    Add Flow XML Element    ${flow}    output-node-connector    ${output_port}    instructions/instruction/apply-actions/action/output-action
-    [Return]    ${flow}
+    Add Flow XML Element
+    ...    ${flow}
+    ...    output-node-connector
+    ...    ${output_port}
+    ...    instructions/instruction/apply-actions/action/output-action
+    RETURN    ${flow}
 
 Set Flow Ethernet Match
-    [Arguments]    ${flow}    ${match_value_dict}
     [Documentation]    Specific keyword for adding an ethernet match rules where the elements are given
     ...    in key/value pairs inside the ${match_value_dict} argument. This keyword will also remove any
     ...    existing ethernet-match elements from the flow before adding
+    [Arguments]    ${flow}    ${match_value_dict}
     Clear Flow Matches    ${flow}    match/ethernet-match
     Add Flow XML Element    ${flow}    ethernet-match    ${EMPTY}    match
     ${type}=    Get From Dictionary    ${match_value_dict}    type
@@ -84,113 +237,160 @@ Set Flow Ethernet Match
     ${dst}=    Get From Dictionary    ${match_value_dict}    destination
     Add Flow XML Element    ${flow}    ethernet-destination    ${EMPTY}    match/ethernet-match
     Add Flow XML Element    ${flow}    address    ${dst}    match/ethernet-match/ethernet-destination
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Set Flow IPv4 Match
-    [Arguments]    ${flow}    ${match_value_dict}
     [Documentation]    Specific keyword for adding an ipv4 match rules where the elements are given
     ...    in key/value pairs inside the ${match_value_dict} argument. This keyword will also remove any
     ...    existing ipv4 match elements from the flow before adding
+    [Arguments]    ${flow}    ${match_value_dict}
     Clear Flow Matches    ${flow}    match/ipv4-source
     Clear Flow Matches    ${flow}    match/ipv4-destination
     ${src}=    Get From Dictionary    ${match_value_dict}    source
     Add Flow XML Element    ${flow}    ipv4-source    ${src}    match
     ${dst}=    Get From Dictionary    ${match_value_dict}    destination
     Add Flow XML Element    ${flow}    ipv4-destination    ${dst}    match
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Clear Flow Actions
-    [Arguments]    ${flow}
     [Documentation]    Will clean out any existing flow actions in the given ${flow} object
+    [Arguments]    ${flow}
     Remove Flow XML Element    ${flow}    instructions/instruction
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Clear Flow Matches
-    [Arguments]    ${flow}    ${match_element}
     [Documentation]    Will clean out any existing flow matches in the given ${flow} object
+    [Arguments]    ${flow}    ${match_element}
     Remove Flow XML Element    ${flow}    match/${match_element}
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Set Flow XML Element Attribute
-    [Arguments]    ${flow}    ${element}    ${id}    ${value}
     [Documentation]    Will set the given id/value pair to the given to the element provided
     ...    and make the proper changes to the ${flow} object also provided.
+    [Arguments]    ${flow}    ${element}    ${id}    ${value}
     ${flow_xml}=    Parse XML    ${flow.xml}
     Set Element Attribute    ${flow_xml}    ${id}    ${value}    xpath=${element}
     ${xml_string}=    Element To String    ${flow_xml}
     Set Flow Field    ${flow}    xml    ${xml_string}
     Log    ${flow.xml}
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Add Flow XML Element
-    [Arguments]    ${flow}    ${element}    ${element_val}=${EMPTY}    ${xpath}=.
     [Documentation]    Will modify the current xml representation of the ${flow} object to contain
     ...    the given ${element} at the given ${xpath}. If the ${element} uses a value, that can be
     ...    passed eith the ${element_val} which defaults to ${EMPTY} if not used. NOTE: since there
     ...    are two default parameters to this keyword, if you have an ${xpath} to use, but no ${element_val}
     ...    you will still need to pass ${EMPTY} when invoking so that ${xpath} will end up at the right
     ...    location in the parameter list
+    [Arguments]    ${flow}    ${element}    ${element_val}=${EMPTY}    ${xpath}=.
     ${flow_xml}=    Parse XML    ${flow.xml}
     Add Element    ${flow_xml}    <${element}>${element_val}</${element}>    xpath=${xpath}
     ${xml_string}=    Element To String    ${flow_xml}
     Set Flow Field    ${flow}    xml    ${xml_string}
     Log    ${flow.xml}
-    [Return]    ${flow}
+    RETURN    ${flow}
 
 Remove Flow XML Element
-    [Arguments]    ${flow}    ${element_xpath}
     [Documentation]    Removes the element at the given ${element_xpath} within the given ${flow}
     ...    object. The ${flow} object's xml representation will be updated to reflect this removal.
+    [Arguments]    ${flow}    ${element_xpath}
     ${flow_xml}=    Parse XML    ${flow.xml}
     Run Keyword And Ignore Error    Remove Elements    ${flow_xml}    xpath=${element_xpath}
     ${xml_string}=    Element To String    ${flow_xml}
     Set Flow Field    ${flow}    xml    ${xml_string}
-    [Return]    ${flow}
+    RETURN    ${flow}
+
+Add Group To Controller And Verify
+    [Documentation]    Push group through REST-API and verify in data-store
+    [Arguments]    ${group_body}    ${node_id}    ${group_id}
+    ${resp}=    RequestsLibrary.PUT On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:group=${group_id}
+    ...    headers=${HEADERS_XML}
+    ...    data=${group_body}
+    Log    ${resp.text}
+    ${resp}=    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:group=${group_id}?content=config
+    ...    headers=${ACCEPT_XML}
+    ...    expected_status=200
+    Log    ${resp.text}
+    Compare Xml    ${group_body}    ${resp.text}
 
 Add Flow To Controller And Verify
-    [Arguments]    ${flow_body}    ${node_id}    ${table_id}    ${flow_id}
     [Documentation]    Push flow through REST-API and verify in data-store
-    ${resp}    RequestsLibrary.Put Request    session    ${REST_CON}/node/${node_id}/table/${table_id}/flow/${flow_id}    headers=${HEADERS_XML}    data=${flow_body}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}/node/${node_id}/table/${table_id}/flow/${flow_id}    headers=${ACCEPT_XML}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    compare xml    ${flow_body}    ${resp.content}
+    [Arguments]    ${flow_body}    ${node_id}    ${table_id}    ${flow_id}
+    ${resp}=    RequestsLibrary.PUT On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:table=${table_id}/flow=${flow_id}
+    ...    headers=${HEADERS_XML}
+    ...    data=${flow_body}
+    Log    ${resp.text}
+    ${resp}=    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:table=${table_id}/flow=${flow_id}?content=config
+    ...    headers=${ACCEPT_XML}
+    ...    expected_status=200
+    Log    ${resp.text}
+    Compare Xml    ${flow_body}    ${resp.text}
 
 Verify Flow On Mininet Switch
-    [Arguments]    ${flow_elements}
     [Documentation]    Checking flow on switch
-    sleep    1
-    write    dpctl dump-flows -O OpenFlow13
-    ${switchoutput}    Read Until    >
-    : FOR    ${flowElement}    IN    @{flow_elements}
-    \    should Contain    ${switchoutput}    ${flowElement}
+    [Arguments]    ${flow_elements}
+    Sleep    1
+    Write    dpctl dump-flows -O OpenFlow13
+    ${switchoutput}=    Read Until    >
+    FOR    ${flowElement}    IN    @{flow_elements}
+        Should Contain    ${switchoutput}    ${flowElement}
+    END
+
+Remove Group From Controller And Verify
+    [Documentation]    Remove group and verify
+    [Arguments]    ${node_id}    ${group_id}
+    ${resp}=    RequestsLibrary.DELETE On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:group=${group_id}
+    ...    expected_status=204
+    Log    ${resp.text}
+    ${resp}=    RequestsLibrary.Get On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:group=${group_id}?content=config
+    ...    expected_status=anything
+    IF    ${resp.status_code} == 404 or ${resp.status_code} == 409    RETURN
+    Builtin.Log    ${resp.text}
+    Builtin.Fail    The request failed with code ${resp.status_code}
 
 Remove Flow From Controller And Verify
-    [Arguments]    ${flow_body}    ${node_id}    ${table_id}    ${flow_id}
-    [Documentation]    Remove flow
-    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}/node/${node_id}/table/${table_id}/flow/${flow_id}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}/node/${node_id}/table/${table_id}
-    Log    ${resp.content}
-    Should Not Contain    ${resp.content}    ${flow_id}
+    [Documentation]    Remove flow and verify
+    [Arguments]    ${node_id}    ${table_id}    ${flow_id}
+    ${resp}=    RequestsLibrary.DELETE On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:table=${table_id}/flow=${flow_id}
+    ...    expected_status=204
+    Log    ${resp.text}
+    ${resp}=    RequestsLibrary.Get On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=${node_id}/flow-node-inventory:table=${table_id}/flow=${flow_id}?content=config
+    ...    expected_status=anything
+    IF    ${resp.status_code} == 404 or ${resp.status_code} == 409    RETURN
+    Builtin.Log    ${resp.text}
+    Builtin.Fail    The request failed with code ${resp.status_code}
 
 Verify Flow Does Not Exist On Mininet Switch
-    [Arguments]    ${flow_elements}
     [Documentation]    Checking flow on switch is removed
-    sleep    1
-    write    dpctl dump-flows -O OpenFlow13
-    ${switchoutput}    Read Until    >
-    : FOR    ${flowElement}    IN    @{flow_elements}
-    \    should Not Contain    ${switchoutput}    ${flowElement}
+    [Arguments]    ${flow_elements}
+    Sleep    1
+    Write    dpctl dump-flows -O OpenFlow13
+    ${switchoutput}=    Read Until    >
+    FOR    ${flowElement}    IN    @{flow_elements}
+        Should Not Contain    ${switchoutput}    ${flowElement}
+    END
 
 Remove Default Flows
-    [Arguments]    ${node_id}
     [Documentation]    Removes any flows considered "default". one such flow is
     ...    to forward all traffic to the CONTROLLER with priority 0 at flow-table 0
     ...    If/When others are implemented this keyword can be updated to include those.
+    [Arguments]    ${node_id}
     ${flow}=    Make Service Flow
     Set "${flow}" "priority" With "0"
     Set "${flow}" "flow-table" With "0"
@@ -198,20 +398,24 @@ Remove Default Flows
     Set Flow XML Element Attribute    ${flow}    node    xmlns:inv    urn:opendaylight:inventory
     Log    Flow XML is ${flow.xml}
     write    dpctl dump-flows -O OpenFlow13
-    ${switchoutput}    Read Until    >
-    ${headers}=    Create Dictionary    Content-Type=application/yang.data+xml
-    ${resp}    RequestsLibrary.Post Request    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 Request    session    ${OPERATIONAL_NODES_API}
-    Log    ${resp.content}
-    Should Not Contain    ${resp.content}    "output-node-connector": "CONTROLLER",
+    ${switchoutput}=    Read Until    >
+    ${headers}=    Create Dictionary    Content-Type=application/yang-data+xml
+    ${resp}=    RequestsLibrary.POST On Session
+    ...    session
+    ...    url=rests/operations/sal-flow:remove-flow
+    ...    data=${flow.xml}
+    ...    headers=${headers}
+    ...    expected_status=200
+    Log    ${resp.text}
+    ${resp}=    RequestsLibrary.GET On Session    session    url=${RFC8040_OPERATIONAL_NODES_API}
+    Log    ${resp.text}
+    Should Not Contain    ${resp.text}    "output-node-connector": "CONTROLLER",
     ${strings_to_check_for}=    Create List    CONTROLLER
     Verify Flow Does Not Exist On Mininet Switch    ${strings_to_check_for}
 
 Create Flow Variables For Suite From XML File
-    [Arguments]    ${file}
     [Documentation]    Given the flow XML ${file}, it will create several suite wide variables
+    [Arguments]    ${file}
     ${data}=    OperatingSystem.Get File    ${file}
     ${xmlroot}=    Parse Xml    ${file}
     ${table_id}=    Get Element Text    ${xmlroot}    table_id
@@ -226,70 +430,84 @@ Create Flow Variables For Suite From XML File
     Set Suite Variable    ${xmlroot}
 
 Check Datastore Presence
-    [Arguments]    ${fname}    ${reqconfpres}    ${reqoperpres}    ${upd}    ${check_id}=${False}
     [Documentation]    Checks if flow is properly existing or not existing in the config and operational
     ...    datastores, based on the variables ${reqconfpres} and ${reqoperpres}
+    [Arguments]    ${fname}    ${reqconfpres}    ${reqoperpres}    ${upd}    ${check_id}=${False}
     Create Flow Variables For Suite From XML File    ${XmlsDir}/${fname}
     # Note:    ${upddata} and ${data} are suite variables set by the keyword above.
     ${det}=    Set Variable If    ${upd}==${True}    ${upddata}    ${data}
+    Log    ${det}
     Check Config Flow    ${reqconfpres}    ${det}
     Check Operational Flow    ${reqoperpres}    ${det}    ${check_id}
 
 Flow Presence In Config Store
-    [Arguments]    ${expvalue}
     [Documentation]    Checks the config store for given flow. Returns True if present, otherwise returns False
     ...    This keyword assumes that the global/suite variables are available (${table_id}, ${flow_id} and ${switch_idx}
+    [Arguments]    ${expvalue}
     ${headers}=    Create Dictionary    Accept=application/xml
-    ${resp}=    RequestsLibrary.Get Request    session    ${CONFIG_NODES_API}/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id}    headers=${headers}
+    ${resp}=    RequestsLibrary.Get On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=openflow%3A${switch_idx}/flow-node-inventory:table=${table_id}/flow=${flow_id}?content=config
+    ...    headers=${headers}
+    ...    expected_status=anything
     Log    ${resp}
-    Log    ${resp.content}
-    Return From Keyword If    ${resp.status_code}!=200    ${False}    ${EMPTY}
-    ${pres}    ${msg}=    Is Flow Configured    ${expvalue}    ${resp.content}
-    Run Keyword If    '''${msg}'''!='${EMPTY}'    Log    ${msg}
-    Return From Keyword    ${pres}    ${msg}
+    Log    ${resp.text}
+    IF    ${resp.status_code}!=200    RETURN    ${False}    ${EMPTY}
+    ${pres}    ${msg}=    Is Flow Configured    ${expvalue}    ${resp.text}
+    IF    '''${msg}'''!='${EMPTY}'    Log    ${msg}
+    RETURN    ${pres}    ${msg}
 
 Flow Presence In Operational Store
-    [Arguments]    ${expvalue}    ${check_id}=${False}
     [Documentation]    Checks the operational store for given flow. Returns True if present, otherwise returns False
     ...    This keyword assumes that the global/suite variables are available (${table_id}, ${flow_id} and ${switch_idx}
+    [Arguments]    ${expvalue}    ${check_id}=${False}
     ${headers}=    Create Dictionary    Accept=application/xml
-    ${resp}=    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}/node/openflow:${switch_idx}/table/${table_id}    headers=${headers}
+    ${resp}=    RequestsLibrary.Get On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=openflow%3A${switch_idx}/flow-node-inventory:table=${table_id}
+    ...    headers=${headers}
+    ...    expected_status=anything
     Log    ${resp}
-    Log    ${resp.content}
-    Return From Keyword If    ${resp.status_code}!=200    ${False}    ${EMPTY}
-    ${pres}    ${msg}=    Is Flow Operational2    ${expvalue}    ${resp.content}    ${check_id}
-    Run Keyword If    '''${msg}'''!='${EMPTY}'    Log    ${msg}
-    Return From Keyword    ${pres}    ${msg}
+    Log    ${resp.text}
+    IF    ${resp.status_code}!=200    RETURN    ${False}    ${EMPTY}
+    ${pres}    ${msg}=    Is Flow Operational2    ${expvalue}    ${resp.text}    ${check_id}
+    IF    '''${msg}'''!='${EMPTY}'    Log    ${msg}
+    RETURN    ${pres}    ${msg}
 
 Get Presence Failure Message
-    [Arguments]    ${ds}    ${expected}    ${presence}    ${diffmsg}
     [Documentation]    Utility keyword to help manipulate mesage strings that may be used later to PASS or FAIL with
-    Return From Keyword If    '''${diffmsg}'''!='${EMPTY}'    Flow found in ${ds} data store but: ${diffmsg}
-    ${msgf}=    Set Variable If    ${expected}==${True}    The flow is expected in ${ds} data store, but    The flow is not expected in ${ds} data store, but
+    [Arguments]    ${ds}    ${expected}    ${presence}    ${diffmsg}
+    IF    '''${diffmsg}'''!='${EMPTY}'
+        RETURN    Flow found in ${ds} data store but: ${diffmsg}
+    END
+    ${msgf}=    Set Variable If
+    ...    ${expected}==${True}
+    ...    The flow is expected in ${ds} data store, but
+    ...    The flow is not expected in ${ds} data store, but
     ${msgp}=    Set Variable If    ${presence}==${True}    it is present.    it is not present.
-    Return From Keyword    ${msgf} ${msgp}
+    RETURN    ${msgf} ${msgp}
 
 Check Config Flow
-    [Arguments]    ${expected}    ${expvalue}
     [Documentation]    Wrapper keyword that calls "Flow Presence In Config Store" and "Get Presence Failure Message" from this library
     ...    to verify that the ${expvalue} flow is or is not found in the config store, depending on whether or not it was ${expected}
+    [Arguments]    ${expected}    ${expvalue}
     ${presence_flow}    ${msg}=    Flow Presence In Config Store    ${expvalue}
     ${msgf}=    Get Presence Failure Message    config    ${expected}    ${presence_flow}    ${msg}
     Should Be Equal    ${expected}    ${presence_flow}    msg=${msgf}
 
 Check Operational Flow
-    [Arguments]    ${expected}    ${expvalue}    ${check_id}=${False}
     [Documentation]    Wrapper keyword that calls "Flow Presence In Operational Store" and "Get Presence Failure Message" from this library
-    ...    to verify that the ${expvalue} flow is or is not found in the config store, depending on whether or not it was ${expected}
+    ...    to verify that the ${expvalue} flow is or is not found in the operational store, depending on whether or not it was ${expected}
+    [Arguments]    ${expected}    ${expvalue}    ${check_id}=${False}
     ${presence_table}    ${msg}=    Flow Presence In Operational Store    ${expvalue}    ${check_id}
     ${msgf}=    Get Presence Failure Message    operational    ${expected}    ${presence_table}    ${msg}
     Should Be Equal    ${expected}    ${presence_table}    msg=${msgf}
 
 Add Flow Via RPC
-    [Arguments]    ${node_id}    ${xmlroot}
     [Documentation]    Deploys a flow specified by given flow details (${node_id}, ${xmlroot}) using add-flow operation.
     ...    ${xmlroot} is an xml object of parser xml flow details, usually created by Create Flow Variables For Suite From XML File
     ...    keyword from this library.
+    [Arguments]    ${node_id}    ${xmlroot}
     ${req}=    Copy Element    ${xmlroot}
     Remove Element    ${req}    id    clear_tail=True
     Set Element Tag    ${req}    input
@@ -299,26 +517,31 @@ Add Flow Via RPC
     Set Element Attribute    ${nodeelm}    xmlns:inv    urn:opendaylight:inventory
     Log Element    ${req}
     ${strxml}=    Element To String    ${req}
-    ${resp}=    RequestsLibrary.Post Request    session    /restconf/operations/sal-flow:add-flow    data=${strxml}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    ${resp}=    RequestsLibrary.POST On Session
+    ...    session
+    ...    url=/rests/operations/sal-flow:add-flow
+    ...    data=${strxml}
+    ...    expected_status=204
+    Log    ${resp.text}
 
 Add Flow Via Restconf
-    [Arguments]    ${node_id}    ${table_id}    ${flow_body}
     [Documentation]    Configures a flow specified by given flow details (${node_id}, ${table_id}, ${flow_body}) using POST method
+    [Arguments]    ${node_id}    ${table_id}    ${flow_body}
     Log    ${flow_body}
-    ${resp}=    RequestsLibrary.Post Request    session    ${CONFIG_NODES_API}/node/openflow:${node_id}/table/${table_id}    data=${flow_body}
-    Log    ${resp.content}
-    ${msg}=    Set Variable    Adding flow for ${CONFIG_NODES_API}/node/openflow:${node_id}/table/${table_id} failed, http response ${resp.status_code} received.
-    Should Be Equal As Strings    ${resp.status_code}    204    msg=${msg}
+    ${resp}=    RequestsLibrary.POST On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=openflow%3A${node_id}/flow-node-inventory:table=${table_id}
+    ...    data=${flow_body}
+    ...    expected_status=201
+    Log    ${resp.text}
 
 Update Flow Via RPC
-    [Arguments]    ${node_id}    ${configured_flow_body}    ${updating_flow_body}
     [Documentation]    Updates a flow by using update-flow operation. ${xmlroot} is usually a variable created by
     ...    Create Flow Variables For Suite From XML File keyword from this library.
+    [Arguments]    ${node_id}    ${configured_flow_body}    ${updating_flow_body}
     Log    ${configured_flow_body}
     Log    ${updating_flow_body}
-    ${xml}    Parse Xml    <input xmlns="urn:opendaylight:flow:service"></input>
+    ${xml}=    Parse Xml    <input xmlns="urn:opendaylight:flow:service"></input>
     Log Element    ${xml}
     ${origflow}=    Parse Xml    ${configured_flow_body}
     ${updflow}=    Parse Xml    ${updating_flow_body}
@@ -335,23 +558,28 @@ Update Flow Via RPC
     Set Element Attribute    ${nodeelm}    xmlns:inv    urn:opendaylight:inventory
     Log Element    ${xml}
     ${strxml}=    Element To String    ${xml}
-    ${resp}=    RequestsLibrary.Post Request    session    /restconf/operations/sal-flow:update-flow    data=${strxml}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    ${resp}=    RequestsLibrary.POST On Session
+    ...    session
+    ...    url=/rests/operations/sal-flow:update-flow
+    ...    data=${strxml}
+    ...    expected_status=204
+    Log    ${resp.text}
 
 Update Flow Via Restconf
-    [Arguments]    ${node_id}    ${table_id}    ${flow_id}    ${flow_body}
     [Documentation]    Updates a flow configuration by given flow details (${node_id}, ${table_id}, ${flow_body}) using PUT method
+    [Arguments]    ${node_id}    ${table_id}    ${flow_id}    ${flow_body}
     Log    ${flow_body}
-    ${resp}=    RequestsLibrary.Put Request    session    ${CONFIG_NODES_API}/node/openflow:${node_id}/table/${table_id}/flow/${flow_id}    data=${flow_body}
-    Log    ${resp.content}
-    ${msg}=    Set Variable    Updating flow for ${CONFIG_NODES_API}/node/openflow:${node_id}/table/${table_id}/flow/${flow_id} failed, http response ${resp.status_code} received.
-    Should Be Equal As Strings    ${resp.status_code}    200    msg=${msg}
+    ${resp}=    RequestsLibrary.PUT On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=openflow%3A${node_id}/flow-node-inventory:table=${table_id}/flow=${flow_id}
+    ...    data=${flow_body}
+    ...    expected_status=204
+    Log    ${resp.text}
 
 Delete Flow Via RPC
-    [Arguments]    ${node_id}    ${xmlroot}
     [Documentation]    Deletes a flow by using remove-flow opearation. ${xmlroot} is usually a variable created by
     ...    Create Flow Variables For Suite From XML File keyword from this library.
+    [Arguments]    ${node_id}    ${xmlroot}
     ${req}=    Copy Element    ${xmlroot}
     Remove Element    ${req}    id    clear_tail=True
     Set Element Tag    ${req}    input
@@ -361,14 +589,28 @@ Delete Flow Via RPC
     Set Element Attribute    ${nodeelm}    xmlns:inv    urn:opendaylight:inventory
     Log Element    ${req}
     ${strxml}=    Element To String    ${req}
-    ${resp}=    RequestsLibrary.Post Request    session    /restconf/operations/sal-flow:remove-flow    data=${strxml}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    ${resp}=    RequestsLibrary.POST On Session
+    ...    session
+    ...    url=/rests/operations/sal-flow:remove-flow
+    ...    data=${strxml}
+    ...    expected_status=204
+    Log    ${resp.text}
 
 Delete Flow Via Restconf
-    [Arguments]    ${node_id}    ${table_id}    ${flow_id}
     [Documentation]    Deletes a flow from configuration datastore specified by given flow details (${node_id}, ${table_id}, ${flow_body}) using DELETE method
-    ${resp}=    RequestsLibrary.Delete Request    session    ${CONFIG_NODES_API}/node/openflow:${node_id}/table/${table_id}/flow/${flow_id}
-    Log    ${resp.content}
-    ${msg}=    Set Variable    Delete flow for ${CONFIG_NODES_API}/node/openflow:${node_id}/table/${table_id}/flow/${flow_id} failed, http response ${resp.status_code} received.
-    Should Be Equal As Strings    ${resp.status_code}    200    msg=${msg}
+    [Arguments]    ${node_id}    ${table_id}    ${flow_id}
+    ${resp}=    RequestsLibrary.DELETE On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=openflow%3A${node_id}/flow-node-inventory:table=${table_id}/flow=${flow_id}
+    ...    expected_status=204
+    Log    ${resp.text}
+
+Get Flow Id
+    [Documentation]    This verifies specific flow-id for particular table-id matching from the flow element
+    [Arguments]    ${dpnid}    ${table_id}    ${flow_element}
+    ${resp}=    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${RFC8040_NODES_API}/node=openflow%3A${dpnid}/flow-node-inventory:table=${table_id}?content=config
+    BuiltIn.Log    ${resp.text}
+    @{flow_id}=    String.Get Regexp Matches    ${resp.text}    id\":\"(\\d+${flow_element})    1
+    RETURN    @{flow_id}[0]