Support only Fluorine+ distributions 88/102588/6
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 10 Oct 2022 11:19:19 +0000 (13:19 +0200)
committerSangwook Ha <sangwook.ha@verizon.com>
Tue, 20 Jun 2023 18:44:19 +0000 (11:44 -0700)
Oxygen is not supported anymore, remove the keywords and update
their keywords to work as if the distro is always at least Fluorine.
Also eliminate If_At_Least_Fluorine macros, as they evaluate to true.

JIRA: INTTEST-133
Change-Id: I3d46034a5d261ea8d2a6bf3c97194dd5081c08bb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
22 files changed:
csit/libraries/CompareStream.robot
csit/libraries/SFC/SfcKeywords.robot
csit/libraries/Sxp.py
csit/libraries/SxpLib.robot
csit/libraries/VpnOperations.robot
csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot
csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
csit/suites/bgpcep/bgpuser/ebgp_peers_basic.robot
csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot
csit/suites/openstack/extensions/sfc.robot
csit/suites/sxp/clustering/020_RPC_Redirecting.robot
csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4/data.json
csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/data.json [deleted file]
csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/location.uri [deleted file]
csit/variables/bgpfunctional/multipaths/rib/data.xml [deleted file]
csit/variables/bgpfunctional/multipaths/rib/location.uri [deleted file]
csit/variables/vpnservice/assoc_router_l3vpn/location.uri [deleted file]
csit/variables/vpnservice/assoc_router_l3vpn/post_data.json [deleted file]
csit/variables/vpnservice/dissoc_router_l3vpn/location.uri [deleted file]
csit/variables/vpnservice/dissoc_router_l3vpn/post_data.json [deleted file]

index 8923236fbb4f08cb648b0aab4a7d9d423472605a..ae1145db63251986f887fd17eccf1b1a3241a683 100644 (file)
@@ -11,7 +11,6 @@ Library             String
 
 *** Variables ***
 &{Stream_dict}
-...                 oxygen=${8}
 ...                 fluorine=${9}
 ...                 neon=${10}
 ...                 sodium=${11}
@@ -46,12 +45,6 @@ Set_Variable_If_At_Most
     ...    ${value_if_true}
     ...    ${value_if_false}
 
-Set_Variable_If_At_Least_Fluorine
-    [Documentation]    Compare fluorine to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at least fluorine,
-    ...    return ${value_if_false} otherwise.
-    [Arguments]    ${value_if_true}    ${value_if_false}
-    BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Least    fluorine    ${value_if_true}    ${value_if_false}
-
 Set_Variable_If_At_Least_Neon
     [Documentation]    Compare neon to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at least neon,
     ...    return ${value_if_false} otherwise.
@@ -94,12 +87,6 @@ Set_Variable_If_At_Least_Chlorine
     [Arguments]    ${value_if_true}    ${value_if_false}
     BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Least    chlorine    ${value_if_true}    ${value_if_false}
 
-Set_Variable_If_At_Most_Oxygen
-    [Documentation]    Compare oxygen to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at most oxygen,
-    ...    return ${value_if_false} otherwise.
-    [Arguments]    ${value_if_true}    ${value_if_false}
-    BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Most    oxygen    ${value_if_true}    ${value_if_false}
-
 Set_Variable_If_At_Most_Fluorine
     [Documentation]    Compare fluorine to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at most fluorine,
     ...    return ${value_if_false} otherwise.
@@ -289,12 +276,6 @@ Run_Keyword_If_Less_Than
     ...    @{varargs}
     ...    &{kwargs}
 
-Run_Keyword_If_At_Least_Fluorine
-    [Documentation]    Compare fluorine to ${ODL_STREAM} and in case ${ODL_STREAM} is at least fluorine,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    fluorine    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_At_Least_Neon
     [Documentation]    Compare neon to ${ODL_STREAM} and in case ${ODL_STREAM} is at least neon,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -343,12 +324,6 @@ Run_Keyword_If_At_Least_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_At_Most_Oxygen
-    [Documentation]    Compare oxygen to ${ODL_STREAM} and in case ${ODL_STREAM} is at most oxygen,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    oxygen    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_At_Most_Fluorine
     [Documentation]    Compare fluorine to ${ODL_STREAM} and in case ${ODL_STREAM} is at most fluroine,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -403,12 +378,6 @@ Run_Keyword_If_At_Most_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_More_Than_Oxygen
-    [Documentation]    Compare oxygen to ${ODL_STREAM} and in case ${ODL_STREAM} is more than oxygen,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    oxygen    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_More_Than_Fluorine
     [Documentation]    Compare fluorine to ${ODL_STREAM} and in case ${ODL_STREAM} is more than fluorine,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -463,12 +432,6 @@ Run_Keyword_If_More_Than_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_Less_Than_Fluorine
-    [Documentation]    Compare fluorine to ${ODL_STREAM} and in case ${ODL_STREAM} is less than fluorine,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_Less_Than    fluorine    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_Less_Than_Neon
     [Documentation]    Compare neon to ${ODL_STREAM} and in case ${ODL_STREAM} is less than neon,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
index 6fb9919541f11f8199503d842df69c2da7828859..30d483e9296f90ad4f45f19c15b097eb78872db9 100644 (file)
@@ -15,8 +15,8 @@ Get JSON Elements From URI
 Check Classifier Flows
     ${flowList} =    DockerSfc.Get Flows In Docker Containers
     BuiltIn.log    ${flowList}
-    ${expected_nsh_pop} =    Set_Variable_If_At_Most    oxygen    *actions=pop_nsh*    *actions=decap(),decap(),*
-    ${expected_nsh_push} =    Set_Variable_If_At_Most    oxygen    *actions=push_nsh*    *actions=encap(nsh*
+    ${expected_nsh_pop} =    BuiltIn.Set_Variable    *actions=decap(),decap(),*
+    ${expected_nsh_push} =    BuiltIn.Set_Variable    *actions=encap(nsh*
     Collections.Should Contain Match    ${flowList}    ${expected_nsh_pop}
     Collections.Should Contain Match    ${flowList}    ${expected_nsh_push}
 
index 0c116134acaedf357ce882ad962ea46f061fdca3..b125d4da3b72fe97505814951c438bec4aceeb82 100644 (file)
@@ -1091,50 +1091,6 @@ def add_domain_xml_fluorine(node_id, name, sgt, prefixes, origin):
     return data
 
 
-def add_domain_xml_oxygen(node_id, name, sgt, prefixes):
-    """Generate xml for Add Domain request (Oxygen version: bindings without origin)
-
-    :param node_id: Id of node
-    :type node_id: str
-    :param name: Name of Domain
-    :type name: str
-    :param sgt: Security group
-    :type sgt: int
-    :param prefixes: List of ip-prefixes
-    :type prefixes: str
-    :returns: String containing xml data for request
-
-    """
-    master_database = ""
-    if prefixes != "None":
-        xml_prefixes = ""
-        for prefix in prefixes.split(","):
-            xml_prefixes += "\n" + "<ip-prefix>" + prefix + "</ip-prefix>"
-        if xml_prefixes:
-            master_database += """<master-database>
-            <binding>
-                <sgt>$sgt</sgt>
-                $xml_prefixes
-            </binding>
-        </master-database>"""
-            master_database = Template(master_database).substitute(
-                ({"sgt": sgt, "xml_prefixes": xml_prefixes})
-            )
-
-    templ = Template(
-        """<input xmlns="urn:opendaylight:sxp:controller">
-    <node-id>$id</node-id>
-    <domain-name>$name</domain-name>
-    $master_database
-</input>"""
-    )
-
-    data = templ.substitute(
-        {"name": name, "id": node_id, "master_database": master_database}
-    )
-    return data
-
-
 def delete_domain_xml(node_id, name):
     """Generate xml for Remove Domain request
 
@@ -1218,39 +1174,6 @@ def add_bindings_xml_fluorine(node_id, domain, sgt, prefixes, origin):
     return data
 
 
-def add_bindings_xml_oxygen(node_id, domain, sgt, prefixes):
-    """Generate xml for Add Bindings request (Oxygen version without origin type)
-
-    :param node_id: Id of node
-    :type node_id: str
-    :param domain: Name of Domain
-    :type domain: str
-    :param sgt: Security group
-    :type sgt: int
-    :param prefixes: List of ip-prefixes
-    :type prefixes: str
-    :returns: String containing xml data for request
-
-    """
-    xml_prefixes = ""
-    for prefix in prefixes.split(","):
-        xml_prefixes += "\n" + "<ip-prefix>" + prefix + "</ip-prefix>"
-    templ = Template(
-        """<input xmlns="urn:opendaylight:sxp:controller">
-    <node-id>$id</node-id>
-    <domain-name>$name</domain-name>
-        <binding>
-            <sgt>$sgt</sgt>
-            $xml_prefixes
-        </binding>
-</input>"""
-    )
-    data = templ.substitute(
-        {"name": domain, "id": node_id, "sgt": sgt, "xml_prefixes": xml_prefixes}
-    )
-    return data
-
-
 def delete_bindings_xml(node_id, domain, sgt, prefixes):
     """Generate xml for Remove Bindings request
 
index 9be72f4c57449bdaaf64a80b981cb9f6d4a646a4..7ee57de3898f5dfb4a0bfae9d185141357034e59 100644 (file)
@@ -4,7 +4,6 @@ Documentation       Library containing Keywords used for SXP testing
 Library             Collections
 Library             RequestsLibrary
 Library             ./Sxp.py
-Resource            CompareStream.robot
 Resource            KarafKeywords.robot
 Resource            TemplatedRequests.robot
 Resource            Utils.robot
@@ -98,21 +97,13 @@ Verify Connection
 Add Bindings
     [Documentation]    Based on ODL version decide if bindings will be added with or without origin type (introduced in Fluorine)
     [Arguments]    ${sgt}    ${prefixes}    ${node}=127.0.0.1    ${session}=session    ${domain}=global    ${origin}=LOCAL
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    Add Bindings Fluorine
+    Add Bindings Fluorine
     ...    ${sgt}
     ...    ${prefixes}
     ...    ${node}
     ...    ${session}
     ...    ${domain}
     ...    ${origin}
-    CompareStream.Run_Keyword_If_At_Most_Oxygen
-    ...    Add Bindings Oxygen
-    ...    ${sgt}
-    ...    ${prefixes}
-    ...    ${node}
-    ...    ${session}
-    ...    ${domain}
 
 Add Bindings Fluorine
     [Documentation]    Add/Update one or more bindings with origin type via RPC to Master DB of the node
@@ -120,12 +111,6 @@ Add Bindings Fluorine
     ${data} =    Sxp.Add Bindings Xml Fluorine    ${node}    ${domain}    ${sgt}    ${prefixes}    ${origin}
     Post To Controller    ${session}    add-bindings    ${data}
 
-Add Bindings Oxygen
-    [Documentation]    Add/Update one or more bindings without origin type via RPC to Master DB of the node
-    [Arguments]    ${sgt}    ${prefixes}    ${node}    ${session}    ${domain}
-    ${data} =    Sxp.Add Bindings Xml Oxygen    ${node}    ${domain}    ${sgt}    ${prefixes}
-    Post To Controller    ${session}    add-bindings    ${data}
-
 Get Bindings
     [Documentation]    Gets all binding via RPC from Master DB of node
     [Arguments]    ${node}=127.0.0.1    ${session}=session    ${domain}=global    ${scope}=all
@@ -309,21 +294,13 @@ Verify Snapshot Was Pushed
 Add Domain
     [Documentation]    Based on ODL version decide if domain's bindings will be added with or without origin type (introduced in Fluorine)
     [Arguments]    ${domain_name}    ${sgt}=None    ${prefixes}=None    ${origin}=LOCAL    ${node}=127.0.0.1    ${session}=session
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    Add Domain Fluorine
+    Add Domain Fluorine
     ...    ${domain_name}
     ...    ${sgt}
     ...    ${prefixes}
     ...    ${origin}
     ...    ${node}
     ...    ${session}
-    CompareStream.Run_Keyword_If_At_Most_Oxygen
-    ...    Add Domain Oxygen
-    ...    ${domain_name}
-    ...    ${sgt}
-    ...    ${prefixes}
-    ...    ${node}
-    ...    ${session}
 
 Add Domain Fluorine
     [Documentation]    Add Domain with bindings (with origin) via RPC
@@ -331,12 +308,6 @@ Add Domain Fluorine
     ${data} =    Sxp.Add Domain Xml Fluorine    ${node}    ${domain_name}    ${sgt}    ${prefixes}    ${origin}
     Post To Controller    ${session}    add-domain    ${data}
 
-Add Domain Oxygen
-    [Documentation]    Add Domain with bindings (without origin) via RPC
-    [Arguments]    ${domain_name}    ${sgt}    ${prefixes}    ${node}    ${session}
-    ${data} =    Sxp.Add Domain Xml Oxygen    ${node}    ${domain_name}    ${sgt}    ${prefixes}
-    Post To Controller    ${session}    add-domain    ${data}
-
 Delete Domain
     [Documentation]    Delete Domain via RPC
     [Arguments]    ${domain_name}    ${node}=127.0.0.1    ${session}=session
index af962f111c31ffa26d483514e7c251df456cfd0f..bb58c03a9e8d80e0764f55b4f8f52fb09cff9acc 100644 (file)
@@ -2,7 +2,6 @@
 Documentation       Openstack library. This library is useful for tests to create network, subnet, router and vm instances
 
 Library             SSHLibrary
-Resource            CompareStream.robot
 Resource            Utils.robot
 Resource            TemplatedRequests.robot
 Resource            KarafKeywords.robot
@@ -133,34 +132,20 @@ Dissociate L3VPN From Networks
 Associate VPN to Router
     [Documentation]    Associate the created L3VPN to a router-id received as argument
     [Arguments]    &{Kwargs}
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    TemplatedRequests.Post_As_Json_Templated
+    TemplatedRequests.Post_As_Json_Templated
     ...    folder=${VAR_BASE}/assoc_two_router_l3vpn
     ...    mapping=${Kwargs}
     ...    session=default
     ...    http_timeout=${SESSION_TIMEOUT}
-    CompareStream.Run_Keyword_If_At_Most_Oxygen
-    ...    TemplatedRequests.Post_As_Json_Templated
-    ...    folder=${VAR_BASE}/assoc_router_l3vpn
-    ...    mapping=${Kwargs}
-    ...    session=default
-    ...    http_timeout=${SESSION_TIMEOUT}
 
 Dissociate VPN to Router
     [Documentation]    Dissociate the already associated routers from L3VPN
     [Arguments]    &{Kwargs}
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    TemplatedRequests.Post_As_Json_Templated
+    TemplatedRequests.Post_As_Json_Templated
     ...    folder=${VAR_BASE}/dissoc_two_router_l3vpn
     ...    mapping=${Kwargs}
     ...    session=default
     ...    http_timeout=${SESSION_TIMEOUT}
-    CompareStream.Run_Keyword_If_At_Most_Oxygen
-    ...    TemplatedRequests.Post_As_Json_Templated
-    ...    folder=${VAR_BASE}/dissoc_router_l3vpn
-    ...    mapping=${Kwargs}
-    ...    session=default
-    ...    http_timeout=${SESSION_TIMEOUT}
 
 VPN Delete L3VPN
     [Documentation]    Delete the created L3VPN
@@ -260,12 +245,7 @@ Verify ARP REQUEST in groupTable
     Should Contain    ${group_output}    group_id=${Group-ID}
     ${arp_group} =    Get Lines Containing String    ${group_output}    group_id=${Group-ID}
     Log    ${arp_group}
-    CompareStream.Run_Keyword_If_At_Most_Oxygen
-    ...    BuiltIn.Should Match Regexp
-    ...    ${arp_group}
-    ...    ${ARP_REQUEST_GROUP_REGEX}
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    BuiltIn.Should Match Regexp
+    BuiltIn.Should Match Regexp
     ...    ${arp_group}
     ...    ${ARP_REQUEST_GROUP_REGEX_FLUORINE}
 
@@ -368,17 +348,11 @@ Verify GWMAC Flow Entry On Flow Table
     #Verify ARP_CHECK_TABLE - 43
     #arp request and response
     ${arpchk_table} =    Get Lines Containing String    ${flow_output}    table=${ARP_CHECK_TABLE}
-    CompareStream.Run_Keyword_If_At_Most_Oxygen
-    ...    BuiltIn.Should Match Regexp
-    ...    ${arpchk_table}
-    ...    ${ARP_RESPONSE_REGEX}
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    BuiltIn.Should Match Regexp
+    BuiltIn.Should Match Regexp
     ...    ${arpchk_table}
     ...    ${ARP_RESPONSE_REGEX_FLUORINE}
     ${arppunt_table} =    String.Get Lines Containing String    ${flow_output}    table=${ARP_PUNT_TABLE}
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    BuiltIn.Should Match Regexp
+    BuiltIn.Should Match Regexp
     ...    ${arppunt_table}
     ...    ${ARP_PUNT_RESPONSE_REGEX}
     ${match} =    Should Match Regexp    ${arpchk_table}    ${ARP_REQUEST_REGEX}
index 5bf32b09c46bd3c72eb6c1efba4d704d4d753b62..8b5e5f13bb736704da69ecb2d6d568064bd3b8ee 100644 (file)
@@ -48,7 +48,6 @@ ${L3VPN_EXA_CFG}                bgp-l3vpn-ipv4.cfg
 ${L3VPN_EXP}                    exa_expected
 ${L3VPN_RSP}                    bgp_l3vpn_ipv4
 ${L3VPN_RSPEMPTY}               bgp_l3vpn_ipv4_empty
-${L3VPN_RSP_PATH}               bgp_l3vpn_ipv4_path
 ${OLD_AS_PATH}                  \n"as-path": {},
 ${NEW_AS_PATH}                  ${EMPTY}
 ${PLAY_SCRIPT}                  ${CURDIR}/../../../../tools/fastbgp/play.py
@@ -75,28 +74,20 @@ Reconfigure_ODL_To_Accept_Connection
     ...    INITIATE=false
     ...    BGP_RIB_OPENCONFIG=${RIB_INSTANCE}
     ...    PASSIVE_MODE=true
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    TemplatedRequests.Put_As_Xml_Templated
+    TemplatedRequests.Put_As_Xml_Templated
     ...    ${RT_CONSTRAIN_DIR}/bgp_peer
     ...    mapping=${mapping}
     ...    session=${CONFIG_SESSION}
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    TemplatedRequests.Put_As_Xml_Templated
-    ...    ${BGP_VAR_FOLDER}/bgp_peer
-    ...    mapping=${mapping}
-    ...    session=${CONFIG_SESSION}
 
 L3vpn_Ipv4_To_Odl
     [Documentation]    Testing mpls vpn ipv4 routes reported to odl from exabgp
     [Setup]    Setup_Testcase    ${L3VPN_EXA_CFG}
-    ${L3VPN_RESPONSE}    CompareStream.Set_Variable_If_At_Least_Fluorine    ${L3VPN_RSP_PATH}    ${L3VPN_RSP}
-    BuiltIn.Wait_Until_Keyword_Succeeds    15s    1s    Verify_Reported_Data    ${L3VPN_RESPONSE}
+    BuiltIn.Wait_Until_Keyword_Succeeds    15s    1s    Verify_Reported_Data    ${L3VPN_RSP}
     [Teardown]    Teardown_Simple
 
 Start_Play
     [Documentation]    Start Python speaker to connect to ODL. We need to do WUKS until odl really starts to accept incomming bgp connection. The failure happens if the incomming connection comes too quickly after configuring the peer in the previous test case.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine    BuiltIn.Pass_Execution    "Only run on Fluorine and later"
     SSHLibrary.Put_File    ${PLAY_SCRIPT}    .
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Read
@@ -105,25 +96,15 @@ Start_Play
 Play_To_Odl_rt_constrain_type_0
     [Documentation]    This keyword sends route-target route containg route-target argument so odl
     ...    can identify this peer as appropriate for advertizement when it recieves such route.
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine    BuiltIn.Pass_Execution    "Only run on Fluorine and later"
     BgpOperations.Play_To_Odl_Non_Removal_Template    rt_constrain_type_0    ${RT_CONSTRAIN_DIR}
 
-Odl_To_Play_l3vpn
-    [Documentation]    Send l3vpn route to app peer, and than checks that app peer advertizes this route.
-    CompareStream.Run_Keyword_If_At_Least_Fluorine    BuiltIn.Pass_Execution    "Only run on less than Fluorine"
-    Setup_Testcase    ${DEFAULT_EXA_CFG}
-    L3vpn_Ipv4_To_App
-    [Teardown]    CompareStream.Run_Keyword_If_Less_Than_Fluorine    Teardowm_With_Remove_Route
-
 Odl_To_Play_l3vpn_rt_arg
     [Documentation]    Same as TC before but fluorine and further this l3vpn route also needs to contain route-target argument.
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine    BuiltIn.Pass_Execution    "Only run on Fluorine and later"
     BgpOperations.Odl_To_Play_Template    l3vpn_rt_arg    ${RT_CONSTRAIN_DIR}    False
 
 Kill_Talking_BGP_Speaker
     [Documentation]    Abort the Python speaker
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine    BuiltIn.Pass_Execution    "Only run on Fluorine and later"
     BGPSpeaker.Kill_BGP_Speaker
     BGPcliKeywords.Store_File_To_Workspace    play.py.out    010_l3vpn_play.log
 
@@ -194,12 +175,6 @@ Setup_Testcase
     ...    ${TOOLS_SYSTEM_IP}
     ...    connection_retries=${3}
 
-Teardowm_With_Remove_Route
-    [Documentation]    Removes configured route from application peer and stops the exabgp
-    &{mapping}    BuiltIn.Create_Dictionary    APP_PEER_IP=${ODL_SYSTEM_IP}
-    TemplatedRequests.Delete_Templated    ${BGP_L3VPN_DIR}/route    mapping=${mapping}    session=${CONFIG_SESSION}
-    Teardown_Simple
-
 Teardown_Simple
     [Documentation]    Testcse teardown with data verification
     ExaBgpLib.Stop_ExaBgp
index 70dd2958e0f1886a0c8f3d743f0279abb278247d..5f9eee1dfa8bb5beb0a681192a40da7a5023b684 100644 (file)
@@ -178,13 +178,7 @@ Configure_Odl_Peer_With_Path_Selection_Mode
     ...    PASSIVE_MODE=true
     ...    MULTIPATH=${npaths}
     ...    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    TemplatedRequests.Put_As_Xml_Templated
-    ...    ${MULT_VAR_FOLDER}/rib
-    ...    mapping=${mapping}
-    ...    session=${CONFIG_SESSION}
-    CompareStream.Run_Keyword_If_At_Least_Fluorine
-    ...    TemplatedRequests.Put_As_Xml_Templated
+    TemplatedRequests.Put_As_Xml_Templated
     ...    ${MULT_VAR_FOLDER}/rib_policies
     ...    mapping=${mapping}
     ...    session=${CONFIG_SESSION}
index 934007d5aec725ae861a2271ff44135324a7adcf..4b749d3bd01f637873e367e24e735d786a991dd0 100644 (file)
@@ -42,9 +42,6 @@ ${CONFIG_SESSION}           config-session
 ${EVPN_DIR}                 ${CURDIR}/../../../variables/bgpfunctional/l2vpn_evpn
 ${BGP_TOOL_LOG_LEVEL}       debug
 ${PLAY_SCRIPT}              ${CURDIR}/../../../../tools/fastbgp/play.py
-${SS}                       ${SPACE}${SPACE}${SPACE}${SPACE}
-${PATH_ID_JSON}             ${SS}${SS}"path-id": 0,${\n}
-${PATH_ID_XML}              ${SS}<path-id>0</path-id>${\n}
 ${OLD_EVPN_ROUTES_LINE}     \n"odl-bgp-evpn:evpn-routes": {},
 ${NEW_EVPN_ROUTES_LINE}     ${EMPTY}
 ${OLD_AS_PATH}              ,\n"as-path": {}
@@ -222,10 +219,10 @@ Play_To_Odl_route_mac_rou
     route_mac_rou
 Odl_To_Play_pmsi_rsvp_te_p2mp_lsp
     [Template]    None
-    CompareStream.Run_Keyword_If_At_Least_Fluorine    Odl_To_Play_Template    pmsi_rsvp_te_p2mp_lsp
+    Odl_To_Play_Template    pmsi_rsvp_te_p2mp_lsp
 Play_To_Odl_pmsi_rsvp_te_p2mp_lsp
     [Template]    None
-    CompareStream.Run_Keyword_If_At_Least_Fluorine    Play_To_Odl_Template    pmsi_rsvp_te_p2mp_lsp
+    Play_To_Odl_Template    pmsi_rsvp_te_p2mp_lsp
 Odl_To_Play_pmsi_mldp_p2mp_lsp
     pmsi_mldp_p2mp_lsp
 Play_To_Odl_pmsi_mldp_p2mp_lsp
@@ -327,13 +324,7 @@ Odl_To_Play_Template
     ${announce_hex} =    String.Remove_String    ${announce_hex}    \n
     ${withdraw_hex} =    OperatingSystem.Get_File    ${EVPN_DIR}/${totest}/withdraw_${totest}.hex
     ${withdraw_hex} =    String.Remove_String    ${withdraw_hex}    \n
-    ${data_path_xml} =    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    String.Replace_String
-    ...    ${data_xml}
-    ...    ${PATH_ID_XML}
-    ...    ${EMPTY}
-    ${post_data_xml} =    CompareStream.Set_Variable_If_At_Least_Fluorine    ${data_xml}    ${data_path_xml}
-    BuiltIn.Log    ${post_data_xml}
+    BuiltIn.Log    ${data_xml}
     BuiltIn.Log    ${data_json}
     BuiltIn.Log    ${announce_hex}
     BuiltIn.Log    ${withdraw_hex}
@@ -341,7 +332,7 @@ Odl_To_Play_Template
     ${resp} =    RequestsLibrary.Post_Request
     ...    ${CONFIG_SESSION}
     ...    ${EVPN_CONF_URL}
-    ...    data=${post_data_xml}
+    ...    data=${data_xml}
     ...    headers=${HEADERS_XML}
     BuiltIn.Log    ${resp.content}
     BuiltIn.Should_Be_Equal_As_Numbers    ${resp.status_code}    201
@@ -371,19 +362,13 @@ Play_To_Odl_Template
     ...    ${mapping}
     ${announce_hex} =    OperatingSystem.Get_File    ${EVPN_DIR}/${totest}/announce_${totest}.hex
     ${withdraw_hex} =    OperatingSystem.Get_File    ${EVPN_DIR}/${totest}/withdraw_${totest}.hex
-    ${data_path_json} =    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    String.Replace_String
-    ...    ${data_json}
-    ...    ${PATH_ID_JSON}
-    ...    ${EMPTY}
-    ${data_json_exp} =    CompareStream.Set_Variable_If_At_Least_Fluorine    ${data_json}    ${data_path_json}
     BuiltIn.Log    ${data_xml}
-    BuiltIn.Log    ${data_json_exp}
+    BuiltIn.Log    ${data_json}
     BuiltIn.Log    ${announce_hex}
     BuiltIn.Log    ${withdraw_hex}
     BgpRpcClient.play_clean
     BgpRpcClient.play_send    ${announce_hex}
-    BuiltIn.Wait_Until_Keyword_Succeeds    4x    2s    Loc_Rib_Presence    ${data_json_exp}
+    BuiltIn.Wait_Until_Keyword_Succeeds    4x    2s    Loc_Rib_Presence    ${data_json}
     BgpRpcClient.play_send    ${withdraw_hex}
     BuiltIn.Wait_Until_Keyword_Succeeds    4x    2s    Verify_Test_Preconditions
     [Teardown]    Withdraw_Route_And_Verify    ${withdraw_hex}
index b4c9cb8fe2c6ff58337325e969e3bb9a88945a69..81a33bf23488a27c00d9d86073556369fa3c3061 100644 (file)
@@ -29,7 +29,6 @@ Library             RequestsLibrary
 Resource            ../../../libraries/BGPcliKeywords.robot
 Resource            ../../../libraries/BgpOperations.robot
 Resource            ../../../libraries/BGPSpeaker.robot
-Resource            ../../../libraries/CompareStream.robot
 Resource            ../../../libraries/FailFast.robot
 Resource            ../../../libraries/SetupUtils.robot
 Resource            ../../../libraries/SSHKeywords.robot
@@ -296,9 +295,6 @@ Delete_BGP_Peers_Configuration
 
 TC_LAS_Reconfigure_Odl_To_Accept_Connection
     [Documentation]    Configure neighbors. One ibgp and one ebgp neighbor with local-as configured.
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid only for versions fluorine and above.
     &{mapping}    Create Dictionary
     ...    IP=${iBGP_PEER1_IP}
     ...    HOLDTIME=${HOLDTIME}
@@ -320,9 +316,6 @@ TC_LAS_Reconfigure_Odl_To_Accept_Connection
 TC_LAS_Start_iBgp_Speaker_And_Verify_Connected
     [Documentation]    Verify that peer is present in odl's rib. Peer is configured with local-as.
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid only for versions fluorine and above.
     SSHLibrary.Switch Connection    ibgp_peer1_console
     ${speaker_args}    BuiltIn.Set_Variable
     ...    --firstprefix ${iBGP_PEER1_FIRST_PREFIX_IP} --prefixlen ${PREFIX_LEN} --amount 1 --myip=${iBGP_PEER1_IP} --myport=${BGP_TOOL_PORT} --peerip=${ODL_SYSTEM_IP} --peerport=${ODL_BGP_PORT} --debug
@@ -335,9 +328,6 @@ TC_LAS_Start_iBgp_Speaker_And_Verify_Connected
 TC_LAS_Start_eBgp_Speaker_And_Verify_Connected
     [Documentation]    Verify that peer is present in odl's rib. Peer is configured with local-as.
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid only for versions fluorine and above.
     SSHLibrary.Switch Connection    ebgp_peer1_console
     ${speaker_args}    BuiltIn.Set_Variable
     ...    --firstprefix ${eBGP_PEER1_FIRST_PREFIX_IP} --prefixlen ${PREFIX_LEN} --amount 1 --asnumber=${eBGP_AS} --myip=${eBGP_PEER1_IP} --myport=${BGP_TOOL_PORT} --peerip=${ODL_SYSTEM_IP} --peerport=${ODL_BGP_PORT} --debug
@@ -350,9 +340,6 @@ TC_LAS_Start_eBgp_Speaker_And_Verify_Connected
 TC_LAS_Verify_iBGP_Rib_Out
     [Documentation]    Verifies iBGP's adj-rib-out output. Expects local-as, and ebgp peer-as presence.
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid only for versions fluorine and above.
     &{mapping}    Create Dictionary
     ...    IP=${iBGP_PEER1_IP}
     ...    HOLDTIME=${HOLDTIME}
@@ -373,9 +360,6 @@ TC_LAS_Verify_iBGP_Rib_Out
 TC_LAS_Verify_eBGP_Rib_Out
     [Documentation]    Verifies eBGP's adj-rib-out output. Expects local-as, and ibgp peer-as presence.
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid only for versions fluorine and above.
     &{mapping}    Create Dictionary
     ...    IP=${eBGP_PEER1_IP}
     ...    HOLDTIME=${HOLDTIME}
@@ -397,9 +381,6 @@ TC_LAS_Kill_iBgp_Speaker_After_Talking
     [Documentation]    Abort the Python speaker. Also, attempt to stop failing fast.
     [Tags]    critical
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid only for versions fluorine and above.
     SSHLibrary.Switch Connection    ibgp_peer1_console
     BGPSpeaker.Kill_BGP_Speaker
     FailFast.Do_Not_Fail_Fast_From_Now_On
@@ -410,9 +391,6 @@ TC_LAS_Kill_eBgp_Speaker_After_Talking
     [Documentation]    Abort the Python speaker. Also, attempt to stop failing fast.
     [Tags]    critical
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid only for versions fluorine and above.
     SSHLibrary.Switch Connection    ebgp_peer1_console
     BGPSpeaker.Kill_BGP_Speaker
     FailFast.Do_Not_Fail_Fast_From_Now_On
@@ -421,9 +399,6 @@ TC_LAS_Kill_eBgp_Speaker_After_Talking
 
 TC_LAS_Delete_Bgp_Peer_Configurations
     [Documentation]    Delete peer configuration.
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid only for versions fluorine and above.
     &{mapping}    Create Dictionary    IP=${iBGP_PEER1_IP}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
     TemplatedRequests.Delete_Templated    ${BGP_VARIABLES_FOLDER}${/}bgp_peer    mapping=${mapping}
     &{mapping}    Create Dictionary    IP=${eBGP_PEER1_IP}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
index a144bbd1ae78282f25f9d7b19b1bbcfdad264d92..0d2874f9bce10448ea7288b452736060c36162b3 100644 (file)
@@ -16,7 +16,6 @@ Library             RequestsLibrary
 Library             DateTime
 Resource            ../../../libraries/BGPcliKeywords.robot
 Resource            ../../../libraries/BgpOperations.robot
-Resource            ../../../libraries/CompareStream.robot
 Resource            ../../../libraries/KarafKeywords.robot
 Resource            ../../../libraries/SetupUtils.robot
 Resource            ../../../libraries/SSHKeywords.robot
@@ -48,8 +47,7 @@ ${CONFIG_SESSION}               config-session
 ${SKIP_PARAMS}                  --skipattr
 ${RIB_INSTANCE}                 example-bgp-rib
 ${PROTOCOL_OPENCONFIG}          ${RIB_INSTANCE}
-${OLD_ROUTE_KEY}                [0, 5, 0, 21, 7, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 0, 1, 0, 1, 5, 6, 7, 8]
-${NEW_ROUTE_KEY}                AAUAFQcAAAAAAAAAAQECAwQAAQABBQYHCA==
+${ROUTE_KEY}                    AAUAFQcAAAAAAAAAAQECAwQAAQABBQYHCA==
 
 
 *** Test Cases ***
@@ -145,8 +143,7 @@ TC2_Connect_BGP_Peer
 TC2_Check_Example_Bgp_Rib
     [Documentation]    Check RIB for linkstate-route(s) and check all of their attributes.
     [Tags]    critical
-    ${route_key}    CompareStream.Set_Variable_If_At_Least_Fluorine    ${NEW_ROUTE_KEY}    ${OLD_ROUTE_KEY}
-    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    ROUTE_KEY=${route_key}
+    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    ROUTE_KEY=${ROUTE_KEY}
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    ${DEFAULT_RIB_CHECK_TIMEOUT}
     ...    ${DEFAULT_RIB_CHECK_PERIOD}
index 61ccf7ecd54cb8e4b410efdd27ac1d18ee10d602..e35dae70a1d674c017b1696a61b5a33ebc296fed 100644 (file)
@@ -531,9 +531,6 @@ TC3_Delete_BGP_Peers_Configuration
 TC4_Configure_Two_iBGP_RR_Clients_With_Cluster_Id
     [Documentation]    Configure two iBGP peers as routing reflector clients with cluster-id argument.
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid for version fluorine and above.
     &{mapping}    BuiltIn.Create_Dictionary
     ...    IP=${BGP_PEER1_IP}
     ...    HOLDTIME=${HOLDTIME}
@@ -560,9 +557,6 @@ TC4_Configure_Two_iBGP_RR_Clients_With_Cluster_Id
 TC4_Connect_BGP_Peers
     [Documentation]    Connect BGP peers, each set to send 3 prefixes.
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid for version fluorine and above.
     SSHLibrary.Switch Connection    bgp_peer1_console
     BuiltIn.Set_Suite_Variable    ${peer1_cluster_id}    127.0.0.4
     BuiltIn.Set_Suite_Variable    ${default_cluster_id}    192.0.2.2
@@ -587,9 +581,6 @@ TC4_BGP_Peer1_Check_Rib_Out_For_Introduced_Prefixes
     ...    on first peer which should contain default-cluster id from global config reflected
     ...    from the second peer equal to router-id.
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid for version fluorine and above.
     &{mapping}    BuiltIn.Create_Dictionary
     ...    IP=${BGP_PEER1_IP}
     ...    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
@@ -609,9 +600,6 @@ TC4_BGP_Peer2_Check_Rib_Out_For_Introduced_Prefixes
     [Documentation]    Check incomming updates for new routes and respective cluster-ids
     ...    in second peer which has local route-reflector-cluster-id
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid for version fluorine and above.
     &{mapping}    BuiltIn.Create_Dictionary
     ...    IP=${BGP_PEER2_IP}
     ...    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
@@ -630,9 +618,6 @@ TC4_BGP_Peer2_Check_Rib_Out_For_Introduced_Prefixes
 TC4_Disconnect_BGP_Peers
     [Documentation]    Stop BGP peer & store logs
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid for version fluorine and above.
     SSHLibrary.Switch Connection    bgp_peer1_console
     BGPCliKeywords.Stop_Console_Tool
     BGPCliKeywords.Store_File_To_Workspace    ${BGP_PEER1_LOG_FILE}    tc4_${BGP_PEER1_LOG_FILE}
@@ -642,9 +627,6 @@ TC4_Disconnect_BGP_Peers
 
 TC4_Check_for_Empty_IPv4_Topology
     [Documentation]    Checks for empty topology after
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid for version fluorine and above.
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    ${DEFAULT_TOPOLOGY_CHECK_TIMEOUT}
     ...    ${DEFAULT_TOPOLOGY_CHECK_PERIOD}
@@ -655,9 +637,6 @@ TC4_Check_for_Empty_IPv4_Topology
 TC4_Delete_BGP_Peers_Configuration
     [Documentation]    Delete all previously configured BGP peers.
     [Tags]    critical
-    CompareStream.Run_Keyword_If_Less_Than_Fluorine
-    ...    BuiltIn.Pass_Execution
-    ...    Test case valid for version fluorine and above.
     &{mapping}    BuiltIn.Create_Dictionary    IP=${BGP_PEER1_IP}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
     TemplatedRequests.Delete_Templated
     ...    ${BGP_VARIABLES_FOLDER}${/}cluster_id/ibgp_peer
index 49960a0b9f4718a622b7d825b31aface476d3eb3..e5b963815cedcf210198d7f518c4e3deb89af765 100644 (file)
@@ -752,26 +752,6 @@ Create Ports For Testing
     OpenStackOperations.Update Port    p1in    additional_args=--disable-port-security
     OpenStackOperations.Update Port    p1out    additional_args=--no-security-group
     OpenStackOperations.Update Port    p1out    additional_args=--disable-port-security
-    CompareStream.Run_Keyword_If_Equals
-    ...    oxygen
-    ...    OpenStackOperations.Update Port
-    ...    source_vm_port
-    ...    additional_args=--no-security-group
-    CompareStream.Run_Keyword_If_Equals
-    ...    oxygen
-    ...    OpenStackOperations.Update Port
-    ...    source_vm_port
-    ...    additional_args=--disable-port-security
-    CompareStream.Run_Keyword_If_Equals
-    ...    oxygen
-    ...    OpenStackOperations.Update Port
-    ...    dest_vm_port
-    ...    additional_args=--no-security-group
-    CompareStream.Run_Keyword_If_Equals
-    ...    oxygen
-    ...    OpenStackOperations.Update Port
-    ...    dest_vm_port
-    ...    additional_args=--disable-port-security
     OpenStackOperations.Get Suite Debugs
 
 Create Instances For Testing
index 64ac0953493d9fcd09ce41fdaf2336c97ea1b208..6926e4a39ba6362c2174a1433d08443adabd319a 100644 (file)
@@ -2,7 +2,6 @@
 Documentation       SXP holds active SXP nodes only on the cluster owner node. Active SXP node holds its master database and datastore access. This implies that all RPC operation logic must be executed only on cluster owner node. In case RPC is send to another cluster node it must be redirected to owner to be properly executed. This suite contains tests for SxpControllerService and SxpConfigControllerService RPCs.
 
 Library             ../../../libraries/Common.py
-Resource            ../../../libraries/CompareStream.robot
 Resource            ../../../libraries/SxpBindingOriginsLib.robot
 Resource            ../../../libraries/SxpClusterLib.robot
 Resource            ../../../libraries/SxpLib.robot
@@ -119,10 +118,6 @@ Test Add/Delete Filter
 Test Add/Update/Delete Binding Origin
     [Documentation]    Binding origin operations need to be executed on cluster owner because they rely on static map which is present solely on cluster owner. To test that binding origin RPCs are redirected to cluster owner first add binding origin to the first node then update it on the second node (requires up-to date binding origin map) and update it on the third node (requires up-to date binding origin map).
     [Tags]    sxp clustering redirecting
-    CompareStream.Run_Keyword_If_Less_Than
-    ...    fluorine
-    ...    BuiltIn.Pass Execution
-    ...    Binding origins are not supported before Fluorine
     SxpBindingOriginsLib.Add Binding Origin    CLUSTER    0    session=ClusterManagement__session_1
     SxpBindingOriginsLib.Update Binding Origin    CLUSTER    3    session=ClusterManagement__session_2
     SxpBindingOriginsLib.Delete Binding Origin    CLUSTER    session=ClusterManagement__session_3
index 4bbae764d8b291940e8cda6d2539d8c17ffb21cc..9ef16743f637d5915e8665065e5cb1d50c1d7bdd 100644 (file)
@@ -2,8 +2,7 @@
  "bgp-vpn-ipv4:vpn-ipv4-routes": {
   "vpn-route": [
    {
-    "attributes": {
-     "as-path": {},
+    "attributes": {$AS_PATH
      "ipv4-next-hop": {
       "global": "10.0.255.254"
      },
@@ -19,6 +18,7 @@
       "label-value": 24005
      }
     ],
+    "path-id": 0,
     "prefix": "1.1.1.0/24",
     "route-distinguisher": "1.2.3.4:1",
     "route-key": "WAABAQIDBAABAQEB"
diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/data.json b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/data.json
deleted file mode 100644 (file)
index 9ef1674..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "bgp-vpn-ipv4:vpn-ipv4-routes": {
-  "vpn-route": [
-   {
-    "attributes": {$AS_PATH
-     "ipv4-next-hop": {
-      "global": "10.0.255.254"
-     },
-     "local-pref": {
-      "pref": 100
-     },
-     "origin": {
-      "value": "igp"
-     }
-    },
-    "label-stack": [
-     {
-      "label-value": 24005
-     }
-    ],
-    "path-id": 0,
-    "prefix": "1.1.1.0/24",
-    "route-distinguisher": "1.2.3.4:1",
-    "route-key": "WAABAQIDBAABAQEB"
-   }
-  ]
- }
-}
diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/location.uri b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/location.uri
deleted file mode 100644 (file)
index 6e7feae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
diff --git a/csit/variables/bgpfunctional/multipaths/rib/data.xml b/csit/variables/bgpfunctional/multipaths/rib/data.xml
deleted file mode 100644 (file)
index 005c0b4..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<protocol xmlns="http://openconfig.net/yang/network-instance">
-    <name>example-bgp-rib</name>
-    <identifier xmlns:x="http://openconfig.net/yang/policy-types">x:BGP</identifier>
-    <bgp xmlns="urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions">
-        <global>
-            <config>
-                <router-id>192.0.2.2</router-id>
-                <as>64496</as>
-            </config>
-            <afi-safis>
-                <afi-safi>
-                    <afi-safi-name xmlns:x="http://openconfig.net/yang/bgp-types">x:IPV4-UNICAST</afi-safi-name>
-                    <receive>true</receive>
-                    <send-max>$MULTIPATH</send-max>
-                </afi-safi>
-            </afi-safis>
-        </global>
-    </bgp>
-</protocol>
diff --git a/csit/variables/bgpfunctional/multipaths/rib/location.uri b/csit/variables/bgpfunctional/multipaths/rib/location.uri
deleted file mode 100644 (file)
index e760065..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,example-bgp-rib
diff --git a/csit/variables/vpnservice/assoc_router_l3vpn/location.uri b/csit/variables/vpnservice/assoc_router_l3vpn/location.uri
deleted file mode 100644 (file)
index 8f5acac..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:associateRouter
diff --git a/csit/variables/vpnservice/assoc_router_l3vpn/post_data.json b/csit/variables/vpnservice/assoc_router_l3vpn/post_data.json
deleted file mode 100644 (file)
index 66a4ef8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "input":{
-      "vpn-id":"$vpnid",
-      "router-id":[
-         "$routerid"
-      ]
-   }
-}
diff --git a/csit/variables/vpnservice/dissoc_router_l3vpn/location.uri b/csit/variables/vpnservice/dissoc_router_l3vpn/location.uri
deleted file mode 100644 (file)
index 6350e1d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:dissociateRouter
diff --git a/csit/variables/vpnservice/dissoc_router_l3vpn/post_data.json b/csit/variables/vpnservice/dissoc_router_l3vpn/post_data.json
deleted file mode 100644 (file)
index 66a4ef8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "input":{
-      "vpn-id":"$vpnid",
-      "router-id":[
-         "$routerid"
-      ]
-   }
-}