Bgp variables cleanup

Removed all folders which are no longer used.
In particular mostly with .beryllium and .boron
extensions.
The rest is mostly tcpmd5user requests, which were
replaced by variables.py in same folder.

Change-Id: I99fce69a4338aba7d3043502b65050455fa1ea03
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>

diff --git a/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot b/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
index 5751705575d1d1d6dcf08baea74b5a892fe464ba..73b267b21f6a9114a6a28d8e3860279c685ff187 100644 (file)
--- a/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
+++ b/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
@@ -15,7 +15,6 @@ Variables         ${CURDIR}/../../../variables/bgpuser/variables.py    ${TOOLS_S
 Resource          ${CURDIR}/../../../libraries/ExaBgpLib.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 
 *** Variables ***

diff --git a/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot b/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
index db2bc89af251ec2a5b114cf00dcb3605107bbde1..d67f5fc43dbf5866958697e36afb2bc214f64a6a 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
+++ b/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
@@ -23,7 +23,6 @@ Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Library           ${CURDIR}/../../../libraries/BgpRpcClient.py    ${TOOLS_SYSTEM_IP}
 Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 
 *** Variables ***
 ${HOLDTIME}       180
@@ -124,7 +123,7 @@ Configure_Path_Selection_And_App_Peer_And_Connect_Peer
 
 Remove_Odl_And_App_Peer_Configuration_And_Stop_ExaBgp
     &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
-    CompareStream.Run_Keyword_If_At_Least_Carbon    TemplatedRequests.Delete_Templated    ${MULT_VAR_FOLDER}/bgp_peer    mapping=${mapping}    session=${CONFIG_SESSION}
+    TemplatedRequests.Delete_Templated    ${MULT_VAR_FOLDER}/bgp_peer    mapping=${mapping}    session=${CONFIG_SESSION}
     Deconfigure_App_Peer
     ExaBgpLib.Stop_ExaBgp
     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed

diff --git a/csit/variables/bgpflowspec/bgp-flowspec-redirect.json.beryllium b/csit/variables/bgpflowspec/bgp-flowspec-redirect.json.beryllium
deleted file mode 100644 (file)
index a98b15e..0000000
--- a/csit/variables/bgpflowspec/bgp-flowspec-redirect.json.beryllium
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "bgp-flowspec:flowspec-routes": {
-        "flowspec-route": [
-            {
-                "route-key": "all packets to 192.168.0.2/32 AND from 10.0.0.2/32",
-                "attributes": {
-                    "extended-communities": [
-                        {
-                            "transitive": true,
-                            "redirect-ip-nh-extended-community": {
-                                "next-hop-address": "0.0.0.0",
-                                "copy": false
-                            }
-                        }
-                    ],
-                    "ipv4-next-hop": {
-                        "global": "1.2.3.4"
-                    },
-                    "origin": {
-                        "value": "igp"
-                    },
-                    "as-path": {},
-                    "local-pref": {
-                        "pref": 100
-                    }
-                },
-                "flowspec": [
-                    {
-                        "destination-prefix": "192.168.0.2/32"
-                    },
-                    {
-                        "source-prefix": "10.0.0.2/32"
-                    }
-                ]
-            },
-            {
-                "route-key": "all packets to 192.168.0.1/32 AND from 10.0.0.1/32",
-                "attributes": {
-                    "extended-communities": [
-                        {
-                            "transitive": true,
-                            "redirect-extended-community": {
-                                "global-administrator": 65500,
-                                "local-administrator": "AAAwOQ=="
-                            }
-                        }
-                    ],
-                    "origin": {
-                        "value": "igp"
-                    },
-                    "as-path": {},
-                    "local-pref": {
-                        "pref": 100
-                    }
-                },
-                "flowspec": [
-                    {
-                        "destination-prefix": "192.168.0.1/32"
-                    },
-                    {
-                        "source-prefix": "10.0.0.1/32"
-                    }
-                ]
-            },
-            {
-                "route-key": "all packets to 192.168.0.4/32 AND from 10.0.0.4/32",
-                "attributes": {
-                    "extended-communities": [
-                        {
-                            "transitive": true,
-                            "redirect-ip-nh-extended-community": {
-                                "next-hop-address": "0.0.0.0",
-                                "copy": false
-                            }
-                        }
-                    ],
-                    "ipv4-next-hop": {
-                        "global": "127.0.0.1"
-                    },
-                    "origin": {
-                        "value": "igp"
-                    },
-                    "as-path": {},
-                    "local-pref": {
-                        "pref": 100
-                    }
-                },
-                "flowspec": [
-                    {
-                        "destination-prefix": "192.168.0.4/32"
-                    },
-                    {
-                        "source-prefix": "10.0.0.4/32"
-                    }
-                ]
-            }
-        ]
-    }
-}

diff --git a/csit/variables/bgpflowspec/bgp-flowspec.json.beryllium b/csit/variables/bgpflowspec/bgp-flowspec.json.beryllium
deleted file mode 100644 (file)
index 56eb06b..0000000
--- a/csit/variables/bgpflowspec/bgp-flowspec.json.beryllium
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "bgp-flowspec:flowspec-routes": {
-        "flowspec-route": [
-            {
-                "route-key": "all packets to 192.168.0.1/32 AND from 10.0.0.1/32 AND where IP protocol equals to 6 AND where port equals to 80 AND where destination port is greater than 8080 and is less than 8088 AND where source port is greater than 1024 AND where ICMP type equals to 0 AND where ICMP code equals to 0 AND where TCP flags does match 32 AND where packet length is greater than 400 and is less than 500 AND where DSCP equals to 20 AND where fragment does match 'IS FIRST' ",
-                "attributes": {
-                    "extended-communities": [
-                        {
-                            "transitive": true,
-                            "traffic-action-extended-community": {
-                                "sample": true,
-                                "terminal-action": true
-                            }
-                        }
-                    ],
-                    "origin": {
-                        "value": "igp"
-                    },
-                    "as-path": {},
-                    "local-pref": {
-                        "pref": 100
-                    }
-                },
-                "flowspec": [
-                    {
-                        "destination-prefix": "192.168.0.1/32"
-                    },
-                    {
-                        "source-prefix": "10.0.0.1/32"
-                    },
-                    {
-                        "protocol-ips": [
-                            {
-                                "op": "equals end-of-list",
-                                "value": 6
-                            }
-                        ]
-                    },
-                    {
-                        "ports": [
-                            {
-                                "op": "equals end-of-list",
-                                "value": 80
-                            }
-                        ]
-                    },
-                    {
-                        "destination-ports": [
-                            {
-                                "op": "greater-than",
-                                "value": 8080
-                            },
-                            {
-                                "op": "end-of-list less-than and-bit",
-                                "value": 8088
-                            }
-                        ]
-                    },
-                    {
-                        "source-ports": [
-                            {
-                                "op": "end-of-list greater-than",
-                                "value": 1024
-                            }
-                        ]
-                    },
-                    {
-                        "types": [
-                            {
-                                "op": "equals end-of-list",
-                                "value": 0
-                            }
-                        ]
-                    },
-                    {
-                        "codes": [
-                            {
-                                "op": "equals end-of-list",
-                                "value": 0
-                            }
-                        ]
-                    },
-                    {
-                        "tcp-flags": [
-                            {
-                                "op": "match end-of-list",
-                                "value": 32
-                            }
-                        ]
-                    },
-                    {
-                        "packet-lengths": [
-                            {
-                                "op": "greater-than",
-                                "value": 400
-                            },
-                            {
-                                "op": "end-of-list less-than and-bit",
-                                "value": 500
-                            }
-                        ]
-                    },
-                    {
-                        "dscps": [
-                            {
-                                "op": "equals end-of-list",
-                                "value": 20
-                            }
-                        ]
-                    },
-                    {
-                        "fragments": [
-                            {
-                                "op": "match end-of-list",
-                                "value": "first"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    }
-}

diff --git a/csit/variables/bgpflowspec/bgp_peer.beryllium/data.xml b/csit/variables/bgpflowspec/bgp_peer.beryllium/data.xml
deleted file mode 100644 (file)
index eae2045..0000000
--- a/csit/variables/bgpflowspec/bgp_peer.beryllium/data.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-peer</type>
-    <name>$NAME</name>
-    <host xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$IP</host>
-    <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$PEER_PORT</port>
-    <holdtimer xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$HOLDTIME</holdtimer>
-    <initiate-connection xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$INITIATE</initiate-connection>
-    <rib xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:rib-instance</type>
-        <name>$RIB_INSTANCE_NAME</name>
-    </rib>
-    <peer-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-peer-registry</type>
-        <name>global-bgp-peer-registry</name>
-    </peer-registry>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv4-unicast</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv6-unicast</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>linkstate</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv4-flowspec</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv6-flowspec</name>
-    </advertized-table>
-</module>

diff --git a/csit/variables/bgpflowspec/bgp_peer.beryllium/location.uri b/csit/variables/bgpflowspec/bgp_peer.beryllium/location.uri
deleted file mode 100644 (file)
index b367efd..0000000
--- a/csit/variables/bgpflowspec/bgp_peer.beryllium/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$NAME

diff --git a/csit/variables/bgpflowspec/bgp_peer.boron/data.xml b/csit/variables/bgpflowspec/bgp_peer.boron/data.xml
deleted file mode 100644 (file)
index eae2045..0000000
--- a/csit/variables/bgpflowspec/bgp_peer.boron/data.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-peer</type>
-    <name>$NAME</name>
-    <host xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$IP</host>
-    <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$PEER_PORT</port>
-    <holdtimer xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$HOLDTIME</holdtimer>
-    <initiate-connection xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$INITIATE</initiate-connection>
-    <rib xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:rib-instance</type>
-        <name>$RIB_INSTANCE_NAME</name>
-    </rib>
-    <peer-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-peer-registry</type>
-        <name>global-bgp-peer-registry</name>
-    </peer-registry>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv4-unicast</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv6-unicast</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>linkstate</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv4-flowspec</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv6-flowspec</name>
-    </advertized-table>
-</module>

diff --git a/csit/variables/bgpflowspec/bgp_peer.boron/location.uri b/csit/variables/bgpflowspec/bgp_peer.boron/location.uri
deleted file mode 100644 (file)
index b367efd..0000000
--- a/csit/variables/bgpflowspec/bgp_peer.boron/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$NAME

diff --git a/csit/variables/bgpfunctional/app_peer.boron/data.xml b/csit/variables/bgpfunctional/app_peer.boron/data.xml
deleted file mode 100644 (file)
index ea547c0..0000000
--- a/csit/variables/bgpfunctional/app_peer.boron/data.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-    <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">x:bgp-application-peer</type>
-    <name>$APP_PEER_NAME</name>
-    <bgp-peer-id xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$APP_PEER_ID</bgp-peer-id>
-    <target-rib xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">x:rib-instance</type>
-        <name>$RIB_INSTANCE_NAME</name>
-    </target-rib>
-    <application-rib-id xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">example-app-rib</application-rib-id>
-    <data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">x:dom-async-data-broker</type>
-        <name>pingpong-broker</name>
-    </data-broker>
-    <bgp-peer-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-      <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-peer-registry</type>
-      <name>global-bgp-peer-registry</name>
-    </bgp-peer-registry>
-</module>

diff --git a/csit/variables/bgpfunctional/app_peer.boron/location.uri b/csit/variables/bgpfunctional/app_peer.boron/location.uri
deleted file mode 100644 (file)
index 19e585f..0000000
--- a/csit/variables/bgpfunctional/app_peer.boron/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-application-peer/$APP_PEER_NAME

diff --git a/csit/variables/bgpfunctional/bgp_peer.boron/data.xml b/csit/variables/bgpfunctional/bgp_peer.boron/data.xml
deleted file mode 100644 (file)
index 35dd147..0000000
--- a/csit/variables/bgpfunctional/bgp_peer.boron/data.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-peer</type>
-    <name>$BGP_NAME</name>
-    <host xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$IP</host>
-    <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$PEER_PORT</port>
-    <holdtimer xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$HOLDTIME</holdtimer>
-    <initiate-connection xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$INITIATE</initiate-connection>
-    <rib xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:rib-instance</type>
-        <name>$RIB_INSTANCE_NAME</name>
-    </rib>
-    <peer-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-peer-registry</type>
-        <name>global-bgp-peer-registry</name>
-    </peer-registry>
-    <rpc-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-        <name>binding-rpc-broker</name>
-    </rpc-registry>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv4-unicast</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv6-unicast</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>linkstate</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>ipv4-l3vpn</name>
-    </advertized-table>
-    <advertized-table xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-table-type</type>
-        <name>evpn</name>
-    </advertized-table>
-    <add-path xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:add-path</type>
-        <name>ipv4-unicast-both</name>
-    </add-path>
-    <add-path xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:add-path</type>
-        <name>ipv6-unicast-both</name>
-    </add-path>
-</module>

diff --git a/csit/variables/bgpfunctional/bgp_peer.boron/location.uri b/csit/variables/bgpfunctional/bgp_peer.boron/location.uri
deleted file mode 100644 (file)
index b88d6eb..0000000
--- a/csit/variables/bgpfunctional/bgp_peer.boron/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$BGP_NAME

diff --git a/csit/variables/bgpfunctional/bmp_basic.beryllium/data.json b/csit/variables/bgpfunctional/bmp_basic.beryllium/data.json
deleted file mode 100644 (file)
index 58bc592..0000000
--- a/csit/variables/bgpfunctional/bmp_basic.beryllium/data.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "bmp-monitor": {
-        "monitor": [
-            {
-                "monitor-id": "example-bmp-monitor",
-                "router": [
-                    {
-                        "router-id": "$TOOL_IP",
-                        "peer": [
-                            {
-                                "peer-id": "1.1.1.1",
-                                "as": 65431,
-                                "address": "1.1.1.1",
-                                "bgp-id": "1.1.1.1",
-                                "pre-policy-rib": {
-                                    "tables": [
-                                        {
-                                            "afi": "bgp-types:ipv4-address-family",
-                                            "safi": "bgp-types:unicast-subsequent-address-family",
-                                            "bgp-inet:ipv4-routes": {},
-                                            "attributes": {
-                                                "uptodate": false
-                                            }
-                                        }
-                                    ]
-                                },
-                                "peer-session": {
-                                    "remote-port": 179,
-                                    "status": "up",
-                                    "local-address": "$TOOL_IP",
-                                    "timestamp-sec": 0,
-                                    "local-port": 179
-                                },
-                                "post-policy-rib": {
-                                    "tables": [
-                                        {
-                                            "afi": "bgp-types:ipv4-address-family",
-                                            "safi": "bgp-types:unicast-subsequent-address-family",
-                                            "bgp-inet:ipv4-routes": {},
-                                            "attributes": {
-                                                "uptodate": false
-                                            }
-                                        }
-                                    ]
-                                },
-                                "type": "global"
-                            }
-                        ],
-                        "status": "up",
-                        "info": "",
-                        "description": "OpenDaylight",
-                        "name": "BMP mock"
-                    }
-                ]
-            }
-        ]
-    }
-}

diff --git a/csit/variables/tcpmd5user/key_access_module/data.xml b/csit/variables/tcpmd5user/key_access_module/data.xml
deleted file mode 100644 (file)
index a5dff39..0000000
--- a/csit/variables/tcpmd5user/key_access_module/data.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:jni:cfg">x:native-key-access-factory</type>
- <name>global-key-access-factory</name>
-</module>

diff --git a/csit/variables/tcpmd5user/key_access_module/location.uri b/csit/variables/tcpmd5user/key_access_module/location.uri
deleted file mode 100644 (file)
index 7bd1f45..0000000
--- a/csit/variables/tcpmd5user/key_access_module/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-tcpmd5-jni-cfg:native-key-access-factory/global-key-access-factory

diff --git a/csit/variables/tcpmd5user/key_access_service/data.xml b/csit/variables/tcpmd5user/key_access_service/data.xml
deleted file mode 100644 (file)
index 8d539fb..0000000
--- a/csit/variables/tcpmd5user/key_access_service/data.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<instance xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
- <name>global-key-access-factory</name>
- <provider>/modules/module[type='native-key-access-factory'][name='global-key-access-factory']</provider>
-</instance>

diff --git a/csit/variables/tcpmd5user/key_access_service/location.uri b/csit/variables/tcpmd5user/key_access_service/location.uri
deleted file mode 100644 (file)
index d2893a6..0000000
--- a/csit/variables/tcpmd5user/key_access_service/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:services/service/odl-tcpmd5-cfg:key-access-factory/config:instance/global-key-access-factory

diff --git a/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.json b/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.json
deleted file mode 100644 (file)
index 5b91e3d..0000000
--- a/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "module": [
-  {
-   "type": "odl-pcep-impl-cfg:pcep-dispatcher-impl",
-   "name": "global-pcep-dispatcher",
-   "odl-pcep-impl-cfg:boss-group": {
-    "type": "netty:netty-threadgroup",
-    "name": "global-boss-group"
-   },
-   "odl-pcep-impl-cfg:max-unknown-messages": 5,
-   "odl-pcep-impl-cfg:md5-server-channel-factory": {
-    "type": "odl-tcpmd5-netty-cfg:md5-server-channel-factory",
-    "name": "md5-server-channel-factory"
-   },
-   "odl-pcep-impl-cfg:md5-channel-factory": {
-    "type": "odl-tcpmd5-netty-cfg:md5-channel-factory",
-    "name": "md5-client-channel-factory"
-   },
-   "odl-pcep-impl-cfg:pcep-extensions": {
-    "type": "odl-pcep-spi-cfg:extensions",
-    "name": "global-pcep-extensions"
-   },
-   "odl-pcep-impl-cfg:pcep-session-proposal-factory": {
-    "type": "odl-pcep-api-cfg:pcep-session-proposal-factory",
-    "name": "pcep-session-proposal-factory-sr"
-   },
-   "odl-pcep-impl-cfg:worker-group": {
-    "type": "netty:netty-threadgroup",
-    "name": "global-worker-group"
-   }
-  }
- ]
-}
\ No newline at end of file

diff --git a/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.xml b/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.xml
deleted file mode 100644 (file)
index 49c098f..0000000
--- a/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">x:pcep-dispatcher-impl</type>
- <name>global-pcep-dispatcher</name>
- <pcep-extensions xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">x:extensions</type>
-  <name>global-pcep-extensions</name>
- </pcep-extensions>
- <pcep-session-proposal-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:pcep">x:pcep-session-proposal-factory</type>
-  <name>pcep-session-proposal-factory-sr</name>
- </pcep-session-proposal-factory>
- <boss-group xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:netty">x:netty-threadgroup</type>
-  <name>global-boss-group</name>
- </boss-group>
- <worker-group xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:netty">x:netty-threadgroup</type>
-  <name>global-worker-group</name>
- </worker-group>
- <max-unknown-messages xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">5</max-unknown-messages>
- <md5-channel-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">x:md5-channel-factory</type>
-  <name>md5-client-channel-factory</name>
- </md5-channel-factory>
- <md5-server-channel-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">x:md5-server-channel-factory</type>
-  <name>md5-server-channel-factory</name>
- </md5-server-channel-factory>
-</module>

diff --git a/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/location.uri b/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/location.uri
deleted file mode 100644 (file)
index 4acf534..0000000
--- a/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-pcep-impl-cfg:pcep-dispatcher-impl/global-pcep-dispatcher?prettyPrint=true

diff --git a/csit/variables/tcpmd5user/md5_client_channel_module/data.xml b/csit/variables/tcpmd5user/md5_client_channel_module/data.xml
deleted file mode 100644 (file)
index 70b9d57..0000000
--- a/csit/variables/tcpmd5user/md5_client_channel_module/data.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">x:md5-client-channel-factory</type>
- <name>md5-client-channel-factory</name>
- <key-access-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:cfg">x:key-access-factory</type>
-  <name>global-key-access-factory</name>
- </key-access-factory>
-</module>

diff --git a/csit/variables/tcpmd5user/md5_client_channel_module/location.uri b/csit/variables/tcpmd5user/md5_client_channel_module/location.uri
deleted file mode 100644 (file)
index efd90c9..0000000
--- a/csit/variables/tcpmd5user/md5_client_channel_module/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-tcpmd5-netty-cfg:md5-client-channel-factory/md5-client-channel-factory

diff --git a/csit/variables/tcpmd5user/md5_client_channel_service/data.xml b/csit/variables/tcpmd5user/md5_client_channel_service/data.xml
deleted file mode 100644 (file)
index 137d172..0000000
--- a/csit/variables/tcpmd5user/md5_client_channel_service/data.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<instance xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
- <name>md5-client-channel-factory</name>
- <provider>/modules/module[type='md5-client-channel-factory'][name='md5-client-channel-factory']</provider>
-</instance>

diff --git a/csit/variables/tcpmd5user/md5_client_channel_service/location.uri b/csit/variables/tcpmd5user/md5_client_channel_service/location.uri
deleted file mode 100644 (file)
index ee46829..0000000
--- a/csit/variables/tcpmd5user/md5_client_channel_service/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:services/service/odl-tcpmd5-netty-cfg:md5-channel-factory/config:instance/md5-client-channel-factory

diff --git a/csit/variables/tcpmd5user/md5_server_channel_module/data.xml b/csit/variables/tcpmd5user/md5_server_channel_module/data.xml
deleted file mode 100644 (file)
index 5cca260..0000000
--- a/csit/variables/tcpmd5user/md5_server_channel_module/data.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
- <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">prefix:md5-server-channel-factory-impl</type>
- <name>md5-server-channel-factory</name>
- <server-key-access-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:cfg">x:key-access-factory</type>
-  <name>global-key-access-factory</name>
- </server-key-access-factory>
-</module>

diff --git a/csit/variables/tcpmd5user/md5_server_channel_module/location.uri b/csit/variables/tcpmd5user/md5_server_channel_module/location.uri
deleted file mode 100644 (file)
index 0276625..0000000
--- a/csit/variables/tcpmd5user/md5_server_channel_module/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-tcpmd5-netty-cfg:md5-server-channel-factory-impl/md5-server-channel-factory

diff --git a/csit/variables/tcpmd5user/md5_server_channel_service/data.xml b/csit/variables/tcpmd5user/md5_server_channel_service/data.xml
deleted file mode 100644 (file)
index 2e0ffe1..0000000
--- a/csit/variables/tcpmd5user/md5_server_channel_service/data.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<instance xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
- <name>md5-server-channel-factory</name>
- <provider>/modules/module[type='md5-server-channel-factory-impl'][name='md5-server-channel-factory']</provider>
-</instance>

diff --git a/csit/variables/tcpmd5user/md5_server_channel_service/location.uri b/csit/variables/tcpmd5user/md5_server_channel_service/location.uri
deleted file mode 100644 (file)
index 36a310f..0000000
--- a/csit/variables/tcpmd5user/md5_server_channel_service/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:services/service/odl-tcpmd5-netty-cfg:md5-server-channel-factory/config:instance/md5-server-channel-factory

diff --git a/csit/variables/tcpmd5user/pcep_client_channel_module/data.xml b/csit/variables/tcpmd5user/pcep_client_channel_module/data.xml
deleted file mode 100644 (file)
index 0b00c70..0000000
--- a/csit/variables/tcpmd5user/pcep_client_channel_module/data.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<md5-channel-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">x:md5-channel-factory</type>
- <name>md5-client-channel-factory</name>
-</md5-channel-factory>

diff --git a/csit/variables/tcpmd5user/pcep_client_channel_module/location.uri b/csit/variables/tcpmd5user/pcep_client_channel_module/location.uri
deleted file mode 100644 (file)
index 3963fe3..0000000
--- a/csit/variables/tcpmd5user/pcep_client_channel_module/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-pcep-impl-cfg:pcep-dispatcher-impl/global-pcep-dispatcher/odl-pcep-impl-cfg:md5-channel-factory

diff --git a/csit/variables/tcpmd5user/pcep_dispatcher_module/data.json b/csit/variables/tcpmd5user/pcep_dispatcher_module/data.json
deleted file mode 100644 (file)
index 31e2f51..0000000
--- a/csit/variables/tcpmd5user/pcep_dispatcher_module/data.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "module": [
-  {
-   "type": "odl-pcep-impl-cfg:pcep-dispatcher-impl",
-   "name": "global-pcep-dispatcher",
-   "odl-pcep-impl-cfg:boss-group": {
-    "type": "netty:netty-threadgroup",
-    "name": "global-boss-group"
-   },
-   "odl-pcep-impl-cfg:max-unknown-messages": 5,
-   "odl-pcep-impl-cfg:md5-server-channel-factory": {
-    "type": "odl-tcpmd5-netty-cfg:md5-server-channel-factory",
-    "name": "md5-server-channel-factory"
-   },
-   "odl-pcep-impl-cfg:md5-channel-factory": {
-    "type": "odl-tcpmd5-netty-cfg:md5-channel-factory",
-    "name": "md5-client-channel-factory"
-   },
-   "odl-pcep-impl-cfg:pcep-extensions": {
-    "type": "odl-pcep-spi-cfg:extensions",
-    "name": "global-pcep-extensions"
-   },
-   "odl-pcep-impl-cfg:pcep-session-proposal-factory": {
-    "type": "odl-pcep-api-cfg:pcep-session-proposal-factory",
-    "name": "global-pcep-session-proposal-factory"
-   },
-   "odl-pcep-impl-cfg:worker-group": {
-    "type": "netty:netty-threadgroup",
-    "name": "global-worker-group"
-   }
-  }
- ]
-}
\ No newline at end of file

diff --git a/csit/variables/tcpmd5user/pcep_dispatcher_module/data.xml b/csit/variables/tcpmd5user/pcep_dispatcher_module/data.xml
deleted file mode 100644 (file)
index b1b9a0b..0000000
--- a/csit/variables/tcpmd5user/pcep_dispatcher_module/data.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">x:pcep-dispatcher-impl</type>
- <name>global-pcep-dispatcher</name>
- <pcep-extensions xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">x:extensions</type>
-  <name>global-pcep-extensions</name>
- </pcep-extensions>
- <pcep-session-proposal-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:pcep">x:pcep-session-proposal-factory</type>
-  <name>global-pcep-session-proposal-factory</name>
- </pcep-session-proposal-factory>
- <boss-group xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:netty">x:netty-threadgroup</type>
-  <name>global-boss-group</name>
- </boss-group>
- <worker-group xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:netty">x:netty-threadgroup</type>
-  <name>global-worker-group</name>
- </worker-group>
- <max-unknown-messages xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">5</max-unknown-messages>
- <md5-channel-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">x:md5-channel-factory</type>
-  <name>md5-client-channel-factory</name>
- </md5-channel-factory>
- <md5-server-channel-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">x:md5-server-channel-factory</type>
-  <name>md5-server-channel-factory</name>
- </md5-server-channel-factory>
-</module>

diff --git a/csit/variables/tcpmd5user/pcep_dispatcher_module/location.uri b/csit/variables/tcpmd5user/pcep_dispatcher_module/location.uri
deleted file mode 100644 (file)
index 4acf534..0000000
--- a/csit/variables/tcpmd5user/pcep_dispatcher_module/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-pcep-impl-cfg:pcep-dispatcher-impl/global-pcep-dispatcher?prettyPrint=true

diff --git a/csit/variables/tcpmd5user/pcep_server_channel_module/data.xml b/csit/variables/tcpmd5user/pcep_server_channel_module/data.xml
deleted file mode 100644 (file)
index dc024c0..0000000
--- a/csit/variables/tcpmd5user/pcep_server_channel_module/data.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<md5-server-channel-factory xmlns="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">x:md5-server-channel-factory</type>
- <name>md5-server-channel-factory</name>
-</md5-server-channel-factory>

diff --git a/csit/variables/tcpmd5user/pcep_server_channel_module/location.uri b/csit/variables/tcpmd5user/pcep_server_channel_module/location.uri
deleted file mode 100644 (file)
index b1cb6ee..0000000
--- a/csit/variables/tcpmd5user/pcep_server_channel_module/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-pcep-impl-cfg:pcep-dispatcher-impl/global-pcep-dispatcher/odl-pcep-impl-cfg:md5-server-channel-factory