From b3a43badc68f1db40ebfe222e2ab61e89f923ab5 Mon Sep 17 00:00:00 2001 From: Tomas Markovic Date: Tue, 20 Feb 2018 12:10:36 +0100 Subject: [PATCH] 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 --- .../bgpcep/bgpflowspec/010_bgp_flowspec.robot | 1 - .../020_bgp_functional_multipath.robot | 3 +- .../bgp-flowspec-redirect.json.beryllium | 99 -------------- .../bgpflowspec/bgp-flowspec.json.beryllium | 123 ------------------ .../bgpflowspec/bgp_peer.beryllium/data.xml | 36 ----- .../bgp_peer.beryllium/location.uri | 1 - .../bgpflowspec/bgp_peer.boron/data.xml | 36 ----- .../bgpflowspec/bgp_peer.boron/location.uri | 1 - .../bgpfunctional/app_peer.boron/data.xml | 18 --- .../bgpfunctional/app_peer.boron/location.uri | 1 - .../bgpfunctional/bgp_peer.boron/data.xml | 48 ------- .../bgpfunctional/bgp_peer.boron/location.uri | 1 - .../bmp_basic.beryllium/data.json | 58 --------- .../tcpmd5user/key_access_module/data.xml | 4 - .../tcpmd5user/key_access_module/location.uri | 1 - .../tcpmd5user/key_access_service/data.xml | 4 - .../key_access_service/location.uri | 1 - .../lithium_pcep_dispatcher_module/data.json | 33 ----- .../lithium_pcep_dispatcher_module/data.xml | 29 ----- .../location.uri | 1 - .../md5_client_channel_module/data.xml | 8 -- .../md5_client_channel_module/location.uri | 1 - .../md5_client_channel_service/data.xml | 4 - .../md5_client_channel_service/location.uri | 1 - .../md5_server_channel_module/data.xml | 8 -- .../md5_server_channel_module/location.uri | 1 - .../md5_server_channel_service/data.xml | 4 - .../md5_server_channel_service/location.uri | 1 - .../pcep_client_channel_module/data.xml | 4 - .../pcep_client_channel_module/location.uri | 1 - .../pcep_dispatcher_module/data.json | 33 ----- .../pcep_dispatcher_module/data.xml | 29 ----- .../pcep_dispatcher_module/location.uri | 1 - .../pcep_server_channel_module/data.xml | 4 - .../pcep_server_channel_module/location.uri | 1 - 35 files changed, 1 insertion(+), 599 deletions(-) delete mode 100644 csit/variables/bgpflowspec/bgp-flowspec-redirect.json.beryllium delete mode 100644 csit/variables/bgpflowspec/bgp-flowspec.json.beryllium delete mode 100644 csit/variables/bgpflowspec/bgp_peer.beryllium/data.xml delete mode 100644 csit/variables/bgpflowspec/bgp_peer.beryllium/location.uri delete mode 100644 csit/variables/bgpflowspec/bgp_peer.boron/data.xml delete mode 100644 csit/variables/bgpflowspec/bgp_peer.boron/location.uri delete mode 100644 csit/variables/bgpfunctional/app_peer.boron/data.xml delete mode 100644 csit/variables/bgpfunctional/app_peer.boron/location.uri delete mode 100644 csit/variables/bgpfunctional/bgp_peer.boron/data.xml delete mode 100644 csit/variables/bgpfunctional/bgp_peer.boron/location.uri delete mode 100644 csit/variables/bgpfunctional/bmp_basic.beryllium/data.json delete mode 100644 csit/variables/tcpmd5user/key_access_module/data.xml delete mode 100644 csit/variables/tcpmd5user/key_access_module/location.uri delete mode 100644 csit/variables/tcpmd5user/key_access_service/data.xml delete mode 100644 csit/variables/tcpmd5user/key_access_service/location.uri delete mode 100644 csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.json delete mode 100644 csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.xml delete mode 100644 csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/location.uri delete mode 100644 csit/variables/tcpmd5user/md5_client_channel_module/data.xml delete mode 100644 csit/variables/tcpmd5user/md5_client_channel_module/location.uri delete mode 100644 csit/variables/tcpmd5user/md5_client_channel_service/data.xml delete mode 100644 csit/variables/tcpmd5user/md5_client_channel_service/location.uri delete mode 100644 csit/variables/tcpmd5user/md5_server_channel_module/data.xml delete mode 100644 csit/variables/tcpmd5user/md5_server_channel_module/location.uri delete mode 100644 csit/variables/tcpmd5user/md5_server_channel_service/data.xml delete mode 100644 csit/variables/tcpmd5user/md5_server_channel_service/location.uri delete mode 100644 csit/variables/tcpmd5user/pcep_client_channel_module/data.xml delete mode 100644 csit/variables/tcpmd5user/pcep_client_channel_module/location.uri delete mode 100644 csit/variables/tcpmd5user/pcep_dispatcher_module/data.json delete mode 100644 csit/variables/tcpmd5user/pcep_dispatcher_module/data.xml delete mode 100644 csit/variables/tcpmd5user/pcep_dispatcher_module/location.uri delete mode 100644 csit/variables/tcpmd5user/pcep_server_channel_module/data.xml delete mode 100644 csit/variables/tcpmd5user/pcep_server_channel_module/location.uri diff --git a/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot b/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot index 5751705575..73b267b21f 100644 --- 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 db2bc89af2..d67f5fc43d 100644 --- 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 index a98b15e302..0000000000 --- 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 index 56eb06b1a1..0000000000 --- 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 index eae2045fdd..0000000000 --- a/csit/variables/bgpflowspec/bgp_peer.beryllium/data.xml +++ /dev/null @@ -1,36 +0,0 @@ - - prefix:bgp-peer - $NAME - $IP - $PEER_PORT - $HOLDTIME - $INITIATE - - prefix:rib-instance - $RIB_INSTANCE_NAME - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - - prefix:bgp-table-type - ipv4-flowspec - - - prefix:bgp-table-type - ipv6-flowspec - - diff --git a/csit/variables/bgpflowspec/bgp_peer.beryllium/location.uri b/csit/variables/bgpflowspec/bgp_peer.beryllium/location.uri deleted file mode 100644 index b367efd4e2..0000000000 --- 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 index eae2045fdd..0000000000 --- a/csit/variables/bgpflowspec/bgp_peer.boron/data.xml +++ /dev/null @@ -1,36 +0,0 @@ - - prefix:bgp-peer - $NAME - $IP - $PEER_PORT - $HOLDTIME - $INITIATE - - prefix:rib-instance - $RIB_INSTANCE_NAME - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - - prefix:bgp-table-type - ipv4-flowspec - - - prefix:bgp-table-type - ipv6-flowspec - - diff --git a/csit/variables/bgpflowspec/bgp_peer.boron/location.uri b/csit/variables/bgpflowspec/bgp_peer.boron/location.uri deleted file mode 100644 index b367efd4e2..0000000000 --- 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 index ea547c0662..0000000000 --- a/csit/variables/bgpfunctional/app_peer.boron/data.xml +++ /dev/null @@ -1,18 +0,0 @@ - - x:bgp-application-peer - $APP_PEER_NAME - $APP_PEER_ID - - x:rib-instance - $RIB_INSTANCE_NAME - - example-app-rib - - x:dom-async-data-broker - pingpong-broker - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - diff --git a/csit/variables/bgpfunctional/app_peer.boron/location.uri b/csit/variables/bgpfunctional/app_peer.boron/location.uri deleted file mode 100644 index 19e585f7a6..0000000000 --- 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 index 35dd1478d6..0000000000 --- a/csit/variables/bgpfunctional/bgp_peer.boron/data.xml +++ /dev/null @@ -1,48 +0,0 @@ - - prefix:bgp-peer - $BGP_NAME - $IP - $PEER_PORT - $HOLDTIME - $INITIATE - - prefix:rib-instance - $RIB_INSTANCE_NAME - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - binding:binding-rpc-registry - binding-rpc-broker - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - - prefix:bgp-table-type - ipv4-l3vpn - - - prefix:bgp-table-type - evpn - - - prefix:add-path - ipv4-unicast-both - - - prefix:add-path - ipv6-unicast-both - - diff --git a/csit/variables/bgpfunctional/bgp_peer.boron/location.uri b/csit/variables/bgpfunctional/bgp_peer.boron/location.uri deleted file mode 100644 index b88d6eb86c..0000000000 --- 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 index 58bc592d5b..0000000000 --- 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 index a5dff39065..0000000000 --- a/csit/variables/tcpmd5user/key_access_module/data.xml +++ /dev/null @@ -1,4 +0,0 @@ - - x:native-key-access-factory - global-key-access-factory - diff --git a/csit/variables/tcpmd5user/key_access_module/location.uri b/csit/variables/tcpmd5user/key_access_module/location.uri deleted file mode 100644 index 7bd1f45e32..0000000000 --- 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 index 8d539fb57f..0000000000 --- a/csit/variables/tcpmd5user/key_access_service/data.xml +++ /dev/null @@ -1,4 +0,0 @@ - - global-key-access-factory - /modules/module[type='native-key-access-factory'][name='global-key-access-factory'] - diff --git a/csit/variables/tcpmd5user/key_access_service/location.uri b/csit/variables/tcpmd5user/key_access_service/location.uri deleted file mode 100644 index d2893a619c..0000000000 --- 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 index 5b91e3d22c..0000000000 --- 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 index 49c098fb98..0000000000 --- a/csit/variables/tcpmd5user/lithium_pcep_dispatcher_module/data.xml +++ /dev/null @@ -1,29 +0,0 @@ - - x:pcep-dispatcher-impl - global-pcep-dispatcher - - x:extensions - global-pcep-extensions - - - x:pcep-session-proposal-factory - pcep-session-proposal-factory-sr - - - x:netty-threadgroup - global-boss-group - - - x:netty-threadgroup - global-worker-group - - 5 - - x:md5-channel-factory - md5-client-channel-factory - - - x:md5-server-channel-factory - md5-server-channel-factory - - 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 index 4acf534977..0000000000 --- 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 index 70b9d57660..0000000000 --- a/csit/variables/tcpmd5user/md5_client_channel_module/data.xml +++ /dev/null @@ -1,8 +0,0 @@ - - x:md5-client-channel-factory - md5-client-channel-factory - - x:key-access-factory - global-key-access-factory - - 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 index efd90c9ced..0000000000 --- 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 index 137d172560..0000000000 --- a/csit/variables/tcpmd5user/md5_client_channel_service/data.xml +++ /dev/null @@ -1,4 +0,0 @@ - - md5-client-channel-factory - /modules/module[type='md5-client-channel-factory'][name='md5-client-channel-factory'] - 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 index ee46829bb1..0000000000 --- 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 index 5cca260fd8..0000000000 --- a/csit/variables/tcpmd5user/md5_server_channel_module/data.xml +++ /dev/null @@ -1,8 +0,0 @@ - - prefix:md5-server-channel-factory-impl - md5-server-channel-factory - - x:key-access-factory - global-key-access-factory - - 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 index 027662595f..0000000000 --- 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 index 2e0ffe1033..0000000000 --- a/csit/variables/tcpmd5user/md5_server_channel_service/data.xml +++ /dev/null @@ -1,4 +0,0 @@ - - md5-server-channel-factory - /modules/module[type='md5-server-channel-factory-impl'][name='md5-server-channel-factory'] - 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 index 36a310f060..0000000000 --- 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 index 0b00c70b9e..0000000000 --- a/csit/variables/tcpmd5user/pcep_client_channel_module/data.xml +++ /dev/null @@ -1,4 +0,0 @@ - - x:md5-channel-factory - md5-client-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 index 3963fe38e6..0000000000 --- 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 index 31e2f51af6..0000000000 --- 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 index b1b9a0be9f..0000000000 --- a/csit/variables/tcpmd5user/pcep_dispatcher_module/data.xml +++ /dev/null @@ -1,29 +0,0 @@ - - x:pcep-dispatcher-impl - global-pcep-dispatcher - - x:extensions - global-pcep-extensions - - - x:pcep-session-proposal-factory - global-pcep-session-proposal-factory - - - x:netty-threadgroup - global-boss-group - - - x:netty-threadgroup - global-worker-group - - 5 - - x:md5-channel-factory - md5-client-channel-factory - - - x:md5-server-channel-factory - md5-server-channel-factory - - diff --git a/csit/variables/tcpmd5user/pcep_dispatcher_module/location.uri b/csit/variables/tcpmd5user/pcep_dispatcher_module/location.uri deleted file mode 100644 index 4acf534977..0000000000 --- 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 index dc024c01e5..0000000000 --- a/csit/variables/tcpmd5user/pcep_server_channel_module/data.xml +++ /dev/null @@ -1,4 +0,0 @@ - - x:md5-server-channel-factory - 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 index b1cb6eee31..0000000000 --- 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 -- 2.36.6