Fix incorrect BGP entity name & type pairs

Get_Owner_And_Successors_For_device requires Bgpcep as the entity type
when the BGP RIB name is given as the entity name.
Another option is to use the entity name with the '-service-group'
suffix, e.g. 'example-bgp-rib-service-group' instead of
'example-bgp-rib', with 'org.opendaylight.mdsal.ServiceEntityType'
as the entity type. In this case the initial attempt to get
the ownership information from
Get_Owner_And_Candidates_For_Device_Singleton will
fail and Get_Owner_And_Candidates_For_Device_Rpc will be used
as a fallback.

There are several test cases that incorrecly use the BGP RIB name with
'org.opendaylight.mdsal.ServiceEntityType'. Fix the errors with the
first option (use 'Bgpcep' as the type) to utilize the abstraction
provided by the keyword.

Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
Change-Id: Ic44cd0f35531cc22bc3e4627ba2edec56084e075

diff --git a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
index bd6309d4bf9d3000a8ed52034da5e3ffcac6391e..28917f43767ba6b148abe8022aa0cb1073b28354 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
+++ b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
@@ -38,7 +38,7 @@ ${COUNT}          1
 *** Test Cases ***
 Get Example Bgp Rib Owner
     [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
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}

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 c9961577e277ca2c149142640e6b215333e077dc..70f72a67ccaf22328302f1bda398281adab6d49d 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
@@ -36,7 +36,7 @@ ${COUNT}          1
 *** Test Cases ***
 Get Example Bgp Rib Owner
     [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
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
index efeb22b183e5da3e9056cd376b065b53f74990b9..db45641a9f488d38ab3f1380a3df5b15be7e4331 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
@@ -38,7 +38,7 @@ ${COUNT}          100000
 *** Test Cases ***
 Get Example Bgp Rib Owner
     [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
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}

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 e0cfd0efe3847746ae8089fd903e8eaeb03b8f03..2df55008bc04558925e4811aba2b237776fccbf3 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
@@ -36,7 +36,7 @@ ${COUNT}          100000
 *** Test Cases ***
 Get Example Bgp Rib Owner
     [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
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
index 9268c1a3d4b5945b4a33e7aa2de37d22bd6aa755..19a3d8a01a8b5234312fd84701f728f57aec2cee 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
@@ -38,7 +38,7 @@ ${COUNT}          1000000
 *** Test Cases ***
 Get Example Bgp Rib Owner
     [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
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}

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 dfb88680d6c3c15f9023beece617c9bf2b83ac40..1ef719ded74aeafaaeeb7ca9ceef7ab6a2dc6da3 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
@@ -36,7 +36,7 @@ ${COUNT}          1000000
 *** Test Cases ***
 Get Example Bgp Rib Owner
     [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
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${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 69aaef76b0718b3b21cb5f9faca0383f7d07e688..9632284f1630217ebeb706d33a2f8511a05eddec 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1Mroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1Mroutes.robot
@@ -40,7 +40,7 @@ ${COUNT}          1000000
 Get Example Bgp Rib Owner
     [Documentation]    Find an odl node which is able to accept incomming connection. It is a node, which is the owner of bgp rib, as it is a singleton service.
     ...    This node should be used for bgp peer to connect to.
-    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot
index 7ba63b75cdcaa2279e6b0cd42141ba63e544a9cf..a2670f50e926b1098b7a8fa7752be9dd89a9fed0 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot
@@ -40,7 +40,7 @@ ${COUNT}          1
 Get Example Bgp Rib Owner
     [Documentation]    Find an odl node which is able to accept incomming connection. It is a node, which is the owner of bgp rib, as it is a singleton service.
     ...    This node should be used for bgp peer to connect to.
-    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot
index 42c45dae1e528e9ff7621c0ea94a68b7696ffd62..c378e89229f9555e615e27ce5338cd66d7c20d0d 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot
@@ -40,7 +40,7 @@ ${COUNT}          300000
 Get Example Bgp Rib Owner
     [Documentation]    Find an odl node which is able to accept incomming connection. It is a node, which is the owner of bgp rib, as it is a singleton service.
     ...    This node should be used for bgp peer to connect to.
-    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib-service-group    org.opendaylight.mdsal.ServiceEntityType    1
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_longevity.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_longevity.robot
index 5c7d5da743515d0ddddd3255a9263ced30fe9947..5cfeb2a0544dea9f5c336764ff938f95a715be71 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_longevity.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_longevity.robot
@@ -41,7 +41,7 @@ ${LONGEVITY_TEST_DURATION_IN_SECS}    82800
 *** Test Cases ***
 Configure_Prefixes_Longevity
     [Documentation]    Configure bgp peer, repeat the test scenario for 24h and deconfigure it.
-    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     PrefixcountKeywords.Set_Shard_Leaders_Location_And_Verify    ${rib_owner}
     BuiltIn.Wait_Until_Keyword_Succeeds    ${INITIAL_RESTCONF_TIMEOUT}    1s    Check_For_Empty_Ipv4_Topology_On_All_Nodes
     &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    BGP_NAME=${BGP_PEER_NAME}    IP=${TOOLS_SYSTEM_IP}    HOLDTIME=${HOLDTIME}    PEER_PORT=${BGP_TOOL_PORT}

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 5248948bc34bf0450473276269bd8bf1bbae86b8..ee01d71336c726987e16e7a67d3d364e4e65a288 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
@@ -42,7 +42,7 @@ ${COUNT}          300000
 Get_Example_Bgp_Rib_Owner
     [Documentation]    Find an odl node which is able to accept incomming connection. It is a node, which is the owner of bgp rib, as it is a singleton service.
     ...    This node should be used for bgp peer to connect to.
-    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_candidates}    ${rib_candidates}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}

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 4fb3588be695d40e42a2bbc12c289518e2bacf85..d960314f6eaebf07825e93849510f9df0981a75c 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
@@ -42,7 +42,7 @@ ${COUNT}          300000
 Get_Example_Bgp_Rib_Owner
     [Documentation]    Find an odl node which is able to accept incomming connection. It is a node, which is the owner of bgp rib, as it is a singleton service.
     ...    This node should be used for bgp peer to connect to.
-    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    org.opendaylight.mdsal.ServiceEntityType    1
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_candidates}    ${rib_candidates}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
index ffcdddf4db938d9dc1a1b3b7878cb8b822603967..f8c29637d7a4551428f57b73d9bbe0c6e2751f64 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
@@ -38,7 +38,7 @@ ${COUNT}          300000
 *** Test Cases ***
 Get Example Bgp Rib Owner
     [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
+    ${rib_owner}    ${rib_candidates}=    ClusterManagement.Get_Owner_And_Successors_For_device    example-bgp-rib    Bgpcep    1
     BuiltIn.Set_Suite_Variable    ${rib_owner}    ${rib_owner}
     BuiltIn.Set_Suite_Variable    ${rib_owner_node_id}    ${ODL_SYSTEM_${rib_owner}_IP}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    ${rib_owner}