Bgpcluster tests netconf removal

Remove netconf configuration from
bgpclustering test cases and libraries.

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

diff --git a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
index 32375595af76846e016c93389f65414fd44e226b..8c63cca5f9a671b8797ca4f0b2324d242ab37b84 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
+++ b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
@@ -30,7 +30,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***
@@ -38,7 +37,7 @@ ${COUNT}          1
 
 *** Test Cases ***
 Get Example Bgp Rib Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
@@ -63,18 +62,6 @@ Check_For_Empty_Ipv4_Topology_Before_Talking_3
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     BuiltIn.Wait_Until_Keyword_Succeeds    ${INITIAL_RESTCONF_TIMEOUT}    1s    PrefixCounting.Check_Ipv4_Topology_Is_Empty    session=${operational_3}    topology=${EXAMPLE_IPV4_TOPOLOGY}
 
-Configure_Netconf_Device
-    [Documentation]    Configures and verifies netconf device configuration. If configuration is not successful, it de-configures the device before the next attempt.
-    # No need for configuring netconf device in carbon and above, openconfig is used
-    CompareStream.Run_Keyword_If_At_Least_Carbon    BuiltIn.Pass_Execution    Openconfig usage does not need netconf connector
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    DEVICE_PORT=1830    DEVICE_IP=${rib_owner_node_id}    DEVICE_USER=admin    DEVICE_PASSWORD=admin
-    # After the netconf device is configured, odl starts downloading schemas. If the downloading will not finish within akka timeout, more tries are needed, 3 is based on a user experience.
-    : FOR    ${index}    IN RANGE    0    3
-    \    ${status}    ${value}=    Run Keyword And Ignore Error    PrefixcountKeywords.Configure_Netconf_Device_And_Check_Mounted    ${mapping}
-    \    Exit For Loop If    '${status}' == 'PASS'
-    \    Run Keyword Unless    '${status}' == 'PASS'    TemplatedRequests.Delete_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}
-    Run Keyword Unless    '${status}' == 'PASS'    Fail
-
 Reconfigure_ODL_To_Accept_Connection
     [Documentation]    Configure BGP peer module with initiate-connection set to false.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
@@ -163,10 +150,3 @@ Delete_Bgp_Peer_Configuration
     &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    BGP_NAME=${BGP_PEER_NAME}    IP=${TOOLS_SYSTEM_IP}    HOLDTIME=${HOLDTIME}    PEER_PORT=${BGP_TOOL_PORT}
     ...    INITIATE=false    BGP_RIB=${RIB_INSTANCE}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
     TemplatedRequests.Delete_Templated    ${BGP_VARIABLES_FOLDER}    mapping=${mapping}    session=${config_session}
-
-Delete_Netconf_Device_Configuration
-    [Documentation]    Revert the netconf configuration to the original stat
-    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    CompareStream.Run_Keyword_If_At_Least_Carbon    BuiltIn.Pass_Execution    Openconfig usage does not need netconf connector
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    DEVICE_PORT=1830    DEVICE_IP=${rib_owner_node_id}    DEVICE_USER=admin    DEVICE_PASSWORD=admin
-    TemplatedRequests.Delete_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}

diff --git a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot
index 9df7a0696e6743bc00361652231891830aad8887..e7d51d14e18f80d507f00b9a79616aaf72cc1d90 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot
+++ b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot
@@ -35,7 +35,7 @@ ${COUNT}          1
 
 *** Test Cases ***
 Get Example Bgp Rib Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}

diff --git a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
index f87e73e1e7b17e6093677c19c2dade851f1a0301..cbf7116fe92b8ca6428c037ce09be66c3eee84c4 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
@@ -20,7 +20,7 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
+Resource          ${CURDIR}/../../../variables/Variables.robot
 Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
 Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
 Resource          ${CURDIR}/../../../libraries/FailFast.robot
@@ -30,7 +30,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***
@@ -38,7 +37,7 @@ ${COUNT}          100000
 
 *** Test Cases ***
 Get Example Bgp Rib Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
@@ -63,18 +62,6 @@ Check_For_Empty_Ipv4_Topology_Before_Talking_3
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     BuiltIn.Wait_Until_Keyword_Succeeds    ${INITIAL_RESTCONF_TIMEOUT}    1s    PrefixCounting.Check_Ipv4_Topology_Is_Empty    session=${operational_3}    topology=${EXAMPLE_IPV4_TOPOLOGY}
 
-Configure_Netconf_Device
-    [Documentation]    Configures and verifies netconf device configuration. If configuration is not successful, it de-configures the device before the next attempt.
-    # No need for configuring netconf device in carbon and above, openconfig is used
-    CompareStream.Run_Keyword_If_At_Least_Carbon    BuiltIn.Pass_Execution    Openconfig usage does not need netconf connector
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    DEVICE_PORT=1830    DEVICE_IP=${rib_owner_node_id}    DEVICE_USER=admin    DEVICE_PASSWORD=admin
-    # After the netconf device is configured, odl starts downloading schemas. If the downloading will not finish within akka timeout, more tries are needed, 3 is based on a user experience.
-    : FOR    ${index}    IN RANGE    0    3
-    \    ${status}    ${value}=    Run Keyword And Ignore Error    PrefixcountKeywords.Configure_Netconf_Device_And_Check_Mounted    ${mapping}
-    \    Exit For Loop If    '${status}' == 'PASS'
-    \    Run Keyword Unless    '${status}' == 'PASS'    TemplatedRequests.Delete_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}
-    Run Keyword Unless    '${status}' == 'PASS'    Fail
-
 Reconfigure_ODL_To_Accept_Connection
     [Documentation]    Configure BGP peer module with initiate-connection set to false.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
@@ -163,10 +150,3 @@ Delete_Bgp_Peer_Configuration
     &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    BGP_NAME=${BGP_PEER_NAME}    IP=${TOOLS_SYSTEM_IP}    HOLDTIME=${HOLDTIME}    PEER_PORT=${BGP_TOOL_PORT}
     ...    INITIATE=false    BGP_RIB=${RIB_INSTANCE}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
     TemplatedRequests.Delete_Templated    ${BGP_VARIABLES_FOLDER}    mapping=${mapping}    session=${config_session}
-
-Delete_Netconf_Device_Configuration
-    [Documentation]    Revert the netconf configuration to the original stat
-    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    CompareStream.Run_Keyword_If_At_Least_Carbon    BuiltIn.Pass_Execution    Openconfig usage does not need netconf connector
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    DEVICE_PORT=1830    DEVICE_IP=${rib_owner_node_id}    DEVICE_USER=admin    DEVICE_PASSWORD=admin
-    TemplatedRequests.Delete_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}

diff --git a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot
index 0f6b559ac9338e2d7e7b5151c7df095b5f07afc9..a5ddb039f39f48aed44b183041b5ca3d1e73c85f 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot
+++ b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot
@@ -35,7 +35,7 @@ ${COUNT}          100000
 
 *** Test Cases ***
 Get Example Bgp Rib Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}

diff --git a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
index c8dc4c1d614281168bbf38154b82155efb2d3ecc..9268c1a3d4b5945b4a33e7aa2de37d22bd6aa755 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
@@ -20,7 +20,7 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
+Resource          ${CURDIR}/../../../variables/Variables.robot
 Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
 Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
 Resource          ${CURDIR}/../../../libraries/FailFast.robot
@@ -30,7 +30,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***
@@ -38,7 +37,7 @@ ${COUNT}          1000000
 
 *** Test Cases ***
 Get Example Bgp Rib Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
@@ -63,18 +62,6 @@ Check_For_Empty_Ipv4_Topology_Before_Talking_3
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     BuiltIn.Wait_Until_Keyword_Succeeds    ${INITIAL_RESTCONF_TIMEOUT}    1s    PrefixCounting.Check_Ipv4_Topology_Is_Empty    session=${operational_3}    topology=${EXAMPLE_IPV4_TOPOLOGY}
 
-Configure_Netconf_Device
-    [Documentation]    Configures and verifies netconf device configuration. If configuration is not successful, it de-configures the device before the next attempt.
-    # No need for configuring netconf device in carbon and above, openconfig is used
-    CompareStream.Run_Keyword_If_At_Least_Carbon    BuiltIn.Pass_Execution    Openconfig usage does not need netconf connector
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    DEVICE_PORT=1830    DEVICE_IP=${rib_owner_node_id}    DEVICE_USER=admin    DEVICE_PASSWORD=admin
-    # After the netconf device is configured, odl starts downloading schemas. If the downloading will not finish within akka timeout, more tries are needed, 3 is based on a user experience.
-    : FOR    ${index}    IN RANGE    0    3
-    \    ${status}    ${value}=    Run Keyword And Ignore Error    PrefixcountKeywords.Configure_Netconf_Device_And_Check_Mounted    ${mapping}
-    \    Exit For Loop If    '${status}' == 'PASS'
-    \    Run Keyword Unless    '${status}' == 'PASS'    TemplatedRequests.Delete_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}
-    Run Keyword Unless    '${status}' == 'PASS'    Fail
-
 Reconfigure_ODL_To_Accept_Connection
     [Documentation]    Configure BGP peer module with initiate-connection set to false.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
@@ -163,10 +150,3 @@ Delete_Bgp_Peer_Configuration
     &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    BGP_NAME=${BGP_PEER_NAME}    IP=${TOOLS_SYSTEM_IP}    HOLDTIME=${HOLDTIME}    PEER_PORT=${BGP_TOOL_PORT}
     ...    INITIATE=false    BGP_RIB=${RIB_INSTANCE}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
     TemplatedRequests.Delete_Templated    ${BGP_VARIABLES_FOLDER}    mapping=${mapping}    session=${config_session}
-
-Delete_Netconf_Device_Configuration
-    [Documentation]    Revert the netconf configuration to the original stat
-    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    CompareStream.Run_Keyword_If_At_Least_Carbon    BuiltIn.Pass_Execution    Openconfig usage does not need netconf connector
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    DEVICE_PORT=1830    DEVICE_IP=${rib_owner_node_id}    DEVICE_USER=admin    DEVICE_PASSWORD=admin
-    TemplatedRequests.Delete_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}

diff --git a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot
index 3328b331fd6c4410abc3612f7da94b3336d9c7d5..512b505e865b5a9fc03100bc2ef4908e4c995dd2 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot
+++ b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot
@@ -35,7 +35,7 @@ ${COUNT}          1000000
 
 *** Test Cases ***
 Get Example Bgp Rib Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}

diff --git a/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot b/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
index 31bd9e2aa9cd85374c473cd0d62bfece29d6dba2..98ecfdf5a6b5347042e11c6d843646937490a18a 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
+++ b/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
@@ -37,7 +37,7 @@ ${RIB_INSTANCE}    example-bgp-rib
 
 *** Test Cases ***
 Get_Example_Bgp_Rib_Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    ClusterManagement.Get_Owner_And_Successors_For_Device    example-bgp-rib
     ...    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set Suite variable    ${rib_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_stop.robot b/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_stop.robot
index f4a7de081144cb8575b27316693e03fc7e28d4ba..1e6cfbcb5660212eb82946472607131888659b1f 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_stop.robot
+++ b/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_stop.robot
@@ -37,7 +37,7 @@ ${RIB_INSTANCE}    example-bgp-rib
 
 *** Test Cases ***
 Get_Example_Bgp_Rib_Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    ClusterManagement.Get_Owner_And_Successors_For_Device    example-bgp-rib
     ...    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set Suite variable    ${rib_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/060_bmp_ha_karaf_restart.robot b/csit/suites/bgpcep/bgpclustering/060_bmp_ha_karaf_restart.robot
index 9b2babc8b301e80be3725b45a55c678e2956084c..8f0b6a53c8c326ec8f39e0ead668a05b814d3fc6 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/060_bmp_ha_karaf_restart.robot
+++ b/csit/suites/bgpcep/bgpclustering/060_bmp_ha_karaf_restart.robot
@@ -34,7 +34,7 @@ ${CONFIG_SESSION}    session
 
 *** Test Cases ***
 Get_Example_Bm_Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${bm_owner}    ${bm_candidates}=    Wait_Until_Keyword_Succeeds    5x    2s    ClusterManagement.Get_Owner_And_Successors_For_Device    bmp-monitors
     ...    Bgpcep    1
     BuiltIn.Set Suite variable    ${bm_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/070_bmp_ha_karaf_stop.robot b/csit/suites/bgpcep/bgpclustering/070_bmp_ha_karaf_stop.robot
index 36a9921aef128876aedc4c77a695621d47521984..d3db8f1d6b949dd1a0a87b91fcc6c3a103488f6f 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/070_bmp_ha_karaf_stop.robot
+++ b/csit/suites/bgpcep/bgpclustering/070_bmp_ha_karaf_stop.robot
@@ -34,7 +34,7 @@ ${CONFIG_SESSION}    session
 
 *** Test Cases ***
 Get_Example_Bm_Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${bm_owner}    ${bm_candidates}=    Wait_Until_Keyword_Succeeds    5x    2s    ClusterManagement.Get_Owner_And_Successors_For_Device    bmp-monitors
     ...    Bgpcep    1
     BuiltIn.Set Suite variable    ${bm_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/080_pcep_ha_karaf_restart.robot b/csit/suites/bgpcep/bgpclustering/080_pcep_ha_karaf_restart.robot
index f2989b456574ffa5e4757639c0bf8bfea39312c9..ddc8e3e42049ac8f05781e92f2423bbfb6ca5689 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/080_pcep_ha_karaf_restart.robot
+++ b/csit/suites/bgpcep/bgpclustering/080_pcep_ha_karaf_restart.robot
@@ -36,7 +36,7 @@ ${CONFIG_SESSION}    session
 
 *** Test Cases ***
 Get_Example_Pcep_Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${pcep_owner}    ${pcep_candidates}=    Wait_Until_Keyword_Succeeds    5x    2s    ClusterManagement.Get_Owner_And_Successors_For_device    pcep-topology
     ...    Bgpcep    1
     BuiltIn.Set Suite variable    ${pcep_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/090_pcep_ha_karaf_stop.robot b/csit/suites/bgpcep/bgpclustering/090_pcep_ha_karaf_stop.robot
index 4094b4f017a443b4937033d768beac561f6a117f..25c45880607453b0394a9b1589da15efa2d8f29e 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/090_pcep_ha_karaf_stop.robot
+++ b/csit/suites/bgpcep/bgpclustering/090_pcep_ha_karaf_stop.robot
@@ -36,7 +36,7 @@ ${CONFIG_SESSION}    session
 
 *** Test Cases ***
 Get_Example_Pcep_Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${pcep_owner}    ${pcep_candidates}=    Wait_Until_Keyword_Succeeds    5x    2s    ClusterManagement.Get_Owner_And_Successors_For_device    pcep-topology
     ...    Bgpcep    1
     BuiltIn.Set Suite variable    ${pcep_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
index 6caa2e4b5a9d36a58bd472fea242ea7fec5a8c8e..f03cf0267b97c27b1b338512b17a24b00c3768b5 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
+++ b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
@@ -27,10 +27,8 @@ Resource          ${CURDIR}/../../../libraries/ClusterAdmin.robot
 *** Variables ***
 ${BGP_TOOL_LOG_LEVEL}    info
 ${BGP_PEER_FOLDER}    ${CURDIR}/../../../variables/bgpclustering/bgp_peer_openconf    # used for configuration of bgp peer via openconfig
-${BGP_VARIABLES_FOLDER}    ${CURDIR}/../../../variables/bgpclustering/bgp_peer    # used for configuration of bgp peer vie netconf connector
+${BGP_VARIABLES_FOLDER}    ${CURDIR}/../../../variables/bgpclustering/bgp_peer    # used for configuration of bgp peer
 ${BGP_VARIABLES_FOLDER_OP}    ${CURDIR}/../../../variables/bgpclustering/bgp_peer_operational
-${NETCONF_DEV_FOLDER}    ${CURDIR}/../../../variables/netconf/device/full-uri-device
-${NETCONF_MOUNT_FOLDER}    ${CURDIR}/../../../variables/netconf/device/full-uri-mount
 ${CHECK_PERIOD}    10
 ${HOLDTIME}       180
 ${INSERT}         1
@@ -93,13 +91,6 @@ Teardown_Everything
     RequestsLibrary.Delete_All_Sessions
     SSHLibrary.Close_All_Connections
 
-Configure_Netconf_Device_And_Check_Mounted
-    [Arguments]    ${mapping}
-    [Documentation]    Configures netconf device
-    # TODO:    This keyword is not specific to prefix counting. Find a better place for it.
-    TemplatedRequests.Put_As_Xml_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}
-    BuiltIn.Wait_Until_Keyword_Succeeds    10x    3s    TemplatedRequests.Get_As_Xml_Templated    ${NETCONF_MOUNT_FOLDER}    mapping=${mapping}    session=${config_session}
-
 Start_Bgp_Peer
     [Arguments]    ${peerip}=${rib_owner_node_id}
     [Documentation]    Starts bgp peer and verifies that the peer runs.

diff --git a/csit/suites/bgpcep/bgpclustering/bgp_ha_karaf_isolation.robot b/csit/suites/bgpcep/bgpclustering/bgp_ha_karaf_isolation.robot
index 47563ceeaf0029f1790bc881c18db9ed1cb7365a..db460c857ba0eb925978c4d904b210de49fa454c 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/bgp_ha_karaf_isolation.robot
+++ b/csit/suites/bgpcep/bgpclustering/bgp_ha_karaf_isolation.robot
@@ -36,7 +36,7 @@ ${RIB_INSTANCE}    example-bgp-rib
 
 *** Test Cases ***
 Get_Example_Bgp_Rib_Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    ClusterManagement.Get_Owner_And_Successors_For_Device    example-bgp-rib
     ...    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set Suite variable    ${rib_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1Mroutes.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1Mroutes.robot
index d18c544e344899bbcf4fde95037e66c05fdc9506..69aaef76b0718b3b21cb5f9faca0383f7d07e688 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1Mroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1Mroutes.robot
@@ -31,7 +31,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot
index b2ac30fed8d3ed30299073a770ff535b886dcc3c..7ba63b75cdcaa2279e6b0cd42141ba63e544a9cf 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot
@@ -31,7 +31,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot
index f48de8e6d5ced34028141ae22d1bdc7030bce9f6..78b7f6483067af5b67e9c375b110c55e35daf7d4 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot
@@ -31,7 +31,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_local.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_local.robot
index 6fb8573f8b98149bb2838baa7f01c520c7133ec2..5248948bc34bf0450473276269bd8bf1bbae86b8 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_local.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_local.robot
@@ -33,7 +33,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_remote.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_remote.robot
index 440d7ac9933a37e743e86d398a8119a4e62a21b8..9e779743a4462fe5ba2f221b12f1424a997a247e 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_remote.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_remote.robot
@@ -33,7 +33,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
index 5b2485e1bd91d7bce346bf8935a5093ef05b144b..621da7d6240cdda36c5f018011a2e0f5994be09a 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
@@ -30,7 +30,6 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/PrefixcountKeywords.robot
 
 *** Variables ***
@@ -38,7 +37,7 @@ ${COUNT}          300000
 
 *** Test Cases ***
 Get Example Bgp Rib Owner
-    [Documentation]    Find an odl node which is able to accept incomming connection. To this node netconf connector should be configured.
+    [Documentation]    Find an odl node which is able to accept incomming connection.
     ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
@@ -63,18 +62,6 @@ Check_For_Empty_Ipv4_Topology_Before_Talking_3
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     BuiltIn.Wait_Until_Keyword_Succeeds    ${INITIAL_RESTCONF_TIMEOUT}    1s    PrefixCounting.Check_Ipv4_Topology_Is_Empty    session=${operational_3}    topology=${EXAMPLE_IPV4_TOPOLOGY}
 
-Configure_Netconf_Device
-    [Documentation]    Configures and verifies netconf device configuration. If configuration is not successful, it de-configures the device before the next attempt.
-    # No need for configuring netconf device in carbon and above, openconfig is used
-    CompareStream.Run_Keyword_If_At_Least_Carbon    BuiltIn.Pass_Execution    Openconfig usage does not need netconf connector
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    DEVICE_PORT=1830    DEVICE_IP=${rib_owner_node_id}    DEVICE_USER=admin    DEVICE_PASSWORD=admin
-    # After the netconf device is configured, odl starts downloading schemas. If the downloading will not finish within akka timeout, more tries are needed, 3 is based on a user experience.
-    : FOR    ${index}    IN RANGE    0    3
-    \    ${status}    ${value}=    Run Keyword And Ignore Error    PrefixcountKeywords.Configure_Netconf_Device_And_Check_Mounted    ${mapping}
-    \    Exit For Loop If    '${status}' == 'PASS'
-    \    Run Keyword Unless    '${status}' == 'PASS'    TemplatedRequests.Delete_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}
-    Run Keyword Unless    '${status}' == 'PASS'    Fail
-
 Reconfigure_ODL_To_Accept_Connection
     [Documentation]    Configure BGP peer module with initiate-connection set to false.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
@@ -163,10 +150,3 @@ Delete_Bgp_Peer_Configuration
     &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    BGP_NAME=${BGP_PEER_NAME}    IP=${TOOLS_SYSTEM_IP}    HOLDTIME=${HOLDTIME}    PEER_PORT=${BGP_TOOL_PORT}
     ...    INITIATE=false    BGP_RIB=${RIB_INSTANCE}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
     TemplatedRequests.Delete_Templated    ${BGP_VARIABLES_FOLDER}    mapping=${mapping}    session=${config_session}
-
-Delete_Netconf_Device_Configuration
-    [Documentation]    Revert the netconf configuration to the original stat
-    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    CompareStream.Run_Keyword_If_At_Least_Carbon    BuiltIn.Pass_Execution    Openconfig usage does not need netconf connector
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    DEVICE_PORT=1830    DEVICE_IP=${rib_owner_node_id}    DEVICE_USER=admin    DEVICE_PASSWORD=admin
-    TemplatedRequests.Delete_Templated    ${NETCONF_DEV_FOLDER}    mapping=${mapping}    session=${config_session}

diff --git a/csit/variables/bgpclustering/bgp_peer.beryllium/data.json b/csit/variables/bgpclustering/bgp_peer.beryllium/data.json
deleted file mode 100644 (file)
index d7f9df9..0000000
--- a/csit/variables/bgpclustering/bgp_peer.beryllium/data.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "module": [
-        {
-            "type": "odl-bgp-rib-impl-cfg:bgp-peer",
-            "name": "$BGP_NAME",
-            "odl-bgp-rib-impl-cfg:rib": {
-                "type": "odl-bgp-rib-impl-cfg:rib-instance",
-                "name": "$BGP_RIB"
-            },
-            "odl-bgp-rib-impl-cfg:holdtimer": $HOLDTIME,
-            "odl-bgp-rib-impl-cfg:port": $PEER_PORT,
-            "odl-bgp-rib-impl-cfg:advertized-table": [
-                {
-                    "type": "odl-bgp-rib-impl-cfg:bgp-table-type",
-                    "name": "ipv4-unicast"
-                },
-                {
-                    "type": "odl-bgp-rib-impl-cfg:bgp-table-type",
-                    "name": "linkstate"
-                },
-                {
-                    "type": "odl-bgp-rib-impl-cfg:bgp-table-type",
-                    "name": "ipv6-unicast"
-                }
-            ],
-            "odl-bgp-rib-impl-cfg:host": "$IP",
-            "odl-bgp-rib-impl-cfg:initiate-connection": $INITIATE,
-            "odl-bgp-rib-impl-cfg:peer-registry": {
-                "type": "odl-bgp-rib-impl-cfg:bgp-peer-registry",
-                "name": "global-bgp-peer-registry"
-            }
-        }
-    ]
-}

diff --git a/csit/variables/bgpclustering/bgp_peer.beryllium/data.xml b/csit/variables/bgpclustering/bgp_peer.beryllium/data.xml
deleted file mode 100644 (file)
index 79329d2..0000000
--- a/csit/variables/bgpclustering/bgp_peer.beryllium/data.xml
+++ /dev/null
@@ -1,28 +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>$BGP_RIB</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>
-</module>

diff --git a/csit/variables/bgpclustering/bgp_peer.beryllium/location.uri b/csit/variables/bgpclustering/bgp_peer.beryllium/location.uri
deleted file mode 100644 (file)
index b88d6eb..0000000
--- a/csit/variables/bgpclustering/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/$BGP_NAME

diff --git a/csit/variables/bgpclustering/bgp_peer.boron/data.json b/csit/variables/bgpclustering/bgp_peer.boron/data.json
deleted file mode 100644 (file)
index d7f9df9..0000000
--- a/csit/variables/bgpclustering/bgp_peer.boron/data.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "module": [
-        {
-            "type": "odl-bgp-rib-impl-cfg:bgp-peer",
-            "name": "$BGP_NAME",
-            "odl-bgp-rib-impl-cfg:rib": {
-                "type": "odl-bgp-rib-impl-cfg:rib-instance",
-                "name": "$BGP_RIB"
-            },
-            "odl-bgp-rib-impl-cfg:holdtimer": $HOLDTIME,
-            "odl-bgp-rib-impl-cfg:port": $PEER_PORT,
-            "odl-bgp-rib-impl-cfg:advertized-table": [
-                {
-                    "type": "odl-bgp-rib-impl-cfg:bgp-table-type",
-                    "name": "ipv4-unicast"
-                },
-                {
-                    "type": "odl-bgp-rib-impl-cfg:bgp-table-type",
-                    "name": "linkstate"
-                },
-                {
-                    "type": "odl-bgp-rib-impl-cfg:bgp-table-type",
-                    "name": "ipv6-unicast"
-                }
-            ],
-            "odl-bgp-rib-impl-cfg:host": "$IP",
-            "odl-bgp-rib-impl-cfg:initiate-connection": $INITIATE,
-            "odl-bgp-rib-impl-cfg:peer-registry": {
-                "type": "odl-bgp-rib-impl-cfg:bgp-peer-registry",
-                "name": "global-bgp-peer-registry"
-            }
-        }
-    ]
-}

diff --git a/csit/variables/bgpclustering/bgp_peer.boron/data.xml b/csit/variables/bgpclustering/bgp_peer.boron/data.xml
deleted file mode 100644 (file)
index 79329d2..0000000
--- a/csit/variables/bgpclustering/bgp_peer.boron/data.xml
+++ /dev/null
@@ -1,28 +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>$BGP_RIB</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>
-</module>

diff --git a/csit/variables/bgpclustering/bgp_peer.boron/location.uri b/csit/variables/bgpclustering/bgp_peer.boron/location.uri
deleted file mode 100644 (file)
index b88d6eb..0000000
--- a/csit/variables/bgpclustering/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