From 0254ab04283bbea34574db9ffd4495b625141a48 Mon Sep 17 00:00:00 2001 From: Sangwook Ha Date: Mon, 25 Oct 2021 01:11:41 -0700 Subject: [PATCH] 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 Change-Id: Ic44cd0f35531cc22bc3e4627ba2edec56084e075 --- .../bgpclustering/010_singlepeer_prefixcount_1route.robot | 2 +- .../010_singlepeer_prefixcount_1route_nonreplicated_rib.robot | 2 +- .../bgpclustering/020_singlepeer_prefixcount_100kroutes.robot | 2 +- ...20_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot | 2 +- .../bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot | 2 +- .../030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot | 2 +- .../bgpcep/bgpclustering/singlepeer_pc_shm_1Mroutes.robot | 2 +- csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1route.robot | 2 +- .../bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot | 2 +- .../bgpclustering/singlepeer_pc_shm_300kroutes_longevity.robot | 2 +- .../singlepeer_pc_shm_300kroutes_shards_local.robot | 2 +- .../singlepeer_pc_shm_300kroutes_shards_remote.robot | 2 +- .../bgpclustering/singlepeer_prefixcount_300kroutes.robot | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot index bd6309d4bf..28917f4376 100644 --- 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 c9961577e2..70f72a67cc 100644 --- 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 efeb22b183..db45641a9f 100644 --- 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 e0cfd0efe3..2df55008bc 100644 --- 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 9268c1a3d4..19a3d8a01a 100644 --- 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 dfb88680d6..1ef719ded7 100644 --- 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 69aaef76b0..9632284f16 100644 --- 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 7ba63b75cd..a2670f50e9 100644 --- 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 42c45dae1e..c378e89229 100644 --- 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 5c7d5da743..5cfeb2a054 100644 --- 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 5248948bc3..ee01d71336 100644 --- 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 4fb3588be6..d960314f6e 100644 --- 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 ffcdddf4db..f8c29637d7 100644 --- 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} -- 2.36.6