From 5e0db03559ff014b9edcf705995e0c862fe363ca Mon Sep 17 00:00:00 2001 From: Sangwook Ha Date: Fri, 29 Mar 2024 17:40:00 -0700 Subject: [PATCH] Use RFC 8040 URL for 'odl-mdsal-lowlevel-*' RPCs The URLs for odl-mdsal-lowlevel-control-{control,target} module RPCs have not been updated to RFC 8040 yet. Fix them up. Signed-off-by: Sangwook Ha Change-Id: I52afc3a94543567ed051d49a187bc1312febfbe8 --- csit/libraries/MdsalLowlevelPy.py | 4 ++-- .../mdsal/lowlevelrpc/become_prefix_leader/location.uri | 2 +- .../lowlevelrpc/check_publish_notifications/location.uri | 2 +- .../mdsal/lowlevelrpc/create_prefix_shard/location.uri | 2 +- csit/variables/mdsal/lowlevelrpc/get_constant/location.uri | 2 +- .../mdsal/lowlevelrpc/get_contexted_constant/location.uri | 2 +- .../mdsal/lowlevelrpc/get_singleton_constant/location.uri | 2 +- .../mdsal/lowlevelrpc/produce_transactions/location.uri | 2 +- .../mdsal/lowlevelrpc/register_bound_constant/location.uri | 2 +- .../mdsal/lowlevelrpc/register_constant/location.uri | 2 +- .../lowlevelrpc/register_flapping_singleton/location.uri | 2 +- .../lowlevelrpc/register_singleton_constant/location.uri | 2 +- .../mdsal/lowlevelrpc/remove_prefix_shard/location.uri | 2 +- .../lowlevelrpc/shutdown_prefix_shard_replica/location.uri | 2 +- .../mdsal/lowlevelrpc/shutdown_shard_replica/location.uri | 2 +- .../lowlevelrpc/start_publish_notifications/location.uri | 2 +- csit/variables/mdsal/lowlevelrpc/subscribe_ddtl/location.uri | 2 +- csit/variables/mdsal/lowlevelrpc/subscribe_dtcl/location.uri | 2 +- csit/variables/mdsal/lowlevelrpc/subscribe_ynl/location.uri | 2 +- .../mdsal/lowlevelrpc/unregister_bound_constant/location.uri | 2 +- .../mdsal/lowlevelrpc/unregister_constant/location.uri | 2 +- .../lowlevelrpc/unregister_flapping_singleton/location.uri | 2 +- .../lowlevelrpc/unregister_singleton_constant/location.uri | 2 +- .../variables/mdsal/lowlevelrpc/unsubscribe_ddtl/location.uri | 2 +- .../variables/mdsal/lowlevelrpc/unsubscribe_dtcl/location.uri | 2 +- csit/variables/mdsal/lowlevelrpc/unsubscribe_ynl/location.uri | 2 +- .../mdsal/lowlevelrpc/write_transactions/location.uri | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/csit/libraries/MdsalLowlevelPy.py b/csit/libraries/MdsalLowlevelPy.py index d6ceb5c831..4e1b24243a 100644 --- a/csit/libraries/MdsalLowlevelPy.py +++ b/csit/libraries/MdsalLowlevelPy.py @@ -124,7 +124,7 @@ def start_write_transactions_on_nodes( "CHAINED_FLAG": "true" if chained_flag else "false", } urlt = string.Template( - """http://$HOST:8181/restconf/operations/odl-mdsal-lowlevel-control:write-transactions""" + """http://$HOST:8181/rests/operations/odl-mdsal-lowlevel-control:write-transactions""" ) _initiate_rpcs(host_list, index_list, urlt, datat, subst_dict) @@ -178,7 +178,7 @@ def start_produce_transactions_on_nodes( "ISOLATED_TRANSACTIONS": "true" if isolated_transactions_flag else "false", } urlt = string.Template( - """http://$HOST:8181/restconf/operations/odl-mdsal-lowlevel-control:produce-transactions""" + """http://$HOST:8181/rests/operations/odl-mdsal-lowlevel-control:produce-transactions""" ) _initiate_rpcs(host_list, index_list, urlt, datat, subst_dict) diff --git a/csit/variables/mdsal/lowlevelrpc/become_prefix_leader/location.uri b/csit/variables/mdsal/lowlevelrpc/become_prefix_leader/location.uri index fb88de7c5d..bb28d90a51 100644 --- a/csit/variables/mdsal/lowlevelrpc/become_prefix_leader/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/become_prefix_leader/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:become-prefix-leader \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:become-prefix-leader diff --git a/csit/variables/mdsal/lowlevelrpc/check_publish_notifications/location.uri b/csit/variables/mdsal/lowlevelrpc/check_publish_notifications/location.uri index 14a3526ec5..475dcf25c8 100644 --- a/csit/variables/mdsal/lowlevelrpc/check_publish_notifications/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/check_publish_notifications/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:check-publish-notifications +/rests/operations/odl-mdsal-lowlevel-control:check-publish-notifications diff --git a/csit/variables/mdsal/lowlevelrpc/create_prefix_shard/location.uri b/csit/variables/mdsal/lowlevelrpc/create_prefix_shard/location.uri index 4f360714ca..b34309016a 100644 --- a/csit/variables/mdsal/lowlevelrpc/create_prefix_shard/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/create_prefix_shard/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:create-prefix-shard +/rests/operations/odl-mdsal-lowlevel-control:create-prefix-shard diff --git a/csit/variables/mdsal/lowlevelrpc/get_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/get_constant/location.uri index 1df1391ba7..f3d05e1cd0 100644 --- a/csit/variables/mdsal/lowlevelrpc/get_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/get_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-target:get-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-target:get-constant diff --git a/csit/variables/mdsal/lowlevelrpc/get_contexted_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/get_contexted_constant/location.uri index 6b5ff937ab..8bcf25c7be 100644 --- a/csit/variables/mdsal/lowlevelrpc/get_contexted_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/get_contexted_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-target:get-contexted-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-target:get-contexted-constant diff --git a/csit/variables/mdsal/lowlevelrpc/get_singleton_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/get_singleton_constant/location.uri index d30fed30cc..6087234f93 100644 --- a/csit/variables/mdsal/lowlevelrpc/get_singleton_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/get_singleton_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-target:get-singleton-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-target:get-singleton-constant diff --git a/csit/variables/mdsal/lowlevelrpc/produce_transactions/location.uri b/csit/variables/mdsal/lowlevelrpc/produce_transactions/location.uri index 6cf9549da9..3597bdf34e 100644 --- a/csit/variables/mdsal/lowlevelrpc/produce_transactions/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/produce_transactions/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:produce-transactions \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:produce-transactions diff --git a/csit/variables/mdsal/lowlevelrpc/register_bound_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/register_bound_constant/location.uri index bc24857d0b..f234f1b9a6 100644 --- a/csit/variables/mdsal/lowlevelrpc/register_bound_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/register_bound_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:register-bound-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:register-bound-constant diff --git a/csit/variables/mdsal/lowlevelrpc/register_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/register_constant/location.uri index 0af89eb82a..310e69ea42 100644 --- a/csit/variables/mdsal/lowlevelrpc/register_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/register_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:register-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:register-constant diff --git a/csit/variables/mdsal/lowlevelrpc/register_flapping_singleton/location.uri b/csit/variables/mdsal/lowlevelrpc/register_flapping_singleton/location.uri index 9fb9587697..40a5da4b75 100644 --- a/csit/variables/mdsal/lowlevelrpc/register_flapping_singleton/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/register_flapping_singleton/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:register-flapping-singleton \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:register-flapping-singleton diff --git a/csit/variables/mdsal/lowlevelrpc/register_singleton_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/register_singleton_constant/location.uri index a192d69bfb..47351539bf 100644 --- a/csit/variables/mdsal/lowlevelrpc/register_singleton_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/register_singleton_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:register-singleton-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:register-singleton-constant diff --git a/csit/variables/mdsal/lowlevelrpc/remove_prefix_shard/location.uri b/csit/variables/mdsal/lowlevelrpc/remove_prefix_shard/location.uri index 65d8867222..0407c7b43c 100644 --- a/csit/variables/mdsal/lowlevelrpc/remove_prefix_shard/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/remove_prefix_shard/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:remove-prefix-shard +/rests/operations/odl-mdsal-lowlevel-control:remove-prefix-shard diff --git a/csit/variables/mdsal/lowlevelrpc/shutdown_prefix_shard_replica/location.uri b/csit/variables/mdsal/lowlevelrpc/shutdown_prefix_shard_replica/location.uri index 7e00f3700d..ce999f1008 100644 --- a/csit/variables/mdsal/lowlevelrpc/shutdown_prefix_shard_replica/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/shutdown_prefix_shard_replica/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:shutdown-prefix-shard-replica +/rests/operations/odl-mdsal-lowlevel-control:shutdown-prefix-shard-replica diff --git a/csit/variables/mdsal/lowlevelrpc/shutdown_shard_replica/location.uri b/csit/variables/mdsal/lowlevelrpc/shutdown_shard_replica/location.uri index 968202bdb0..ce08c60cc2 100644 --- a/csit/variables/mdsal/lowlevelrpc/shutdown_shard_replica/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/shutdown_shard_replica/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:shutdown-shard-replica +/rests/operations/odl-mdsal-lowlevel-control:shutdown-shard-replica diff --git a/csit/variables/mdsal/lowlevelrpc/start_publish_notifications/location.uri b/csit/variables/mdsal/lowlevelrpc/start_publish_notifications/location.uri index 7c0fbb1a98..4a3d364d0c 100644 --- a/csit/variables/mdsal/lowlevelrpc/start_publish_notifications/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/start_publish_notifications/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:start-publish-notifications +/rests/operations/odl-mdsal-lowlevel-control:start-publish-notifications diff --git a/csit/variables/mdsal/lowlevelrpc/subscribe_ddtl/location.uri b/csit/variables/mdsal/lowlevelrpc/subscribe_ddtl/location.uri index 8725e8b175..daf35fb549 100644 --- a/csit/variables/mdsal/lowlevelrpc/subscribe_ddtl/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/subscribe_ddtl/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:subscribe-ddtl \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:subscribe-ddtl diff --git a/csit/variables/mdsal/lowlevelrpc/subscribe_dtcl/location.uri b/csit/variables/mdsal/lowlevelrpc/subscribe_dtcl/location.uri index 5d30b0fd03..06fe70abb1 100644 --- a/csit/variables/mdsal/lowlevelrpc/subscribe_dtcl/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/subscribe_dtcl/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:subscribe-dtcl \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:subscribe-dtcl diff --git a/csit/variables/mdsal/lowlevelrpc/subscribe_ynl/location.uri b/csit/variables/mdsal/lowlevelrpc/subscribe_ynl/location.uri index f0c5e6a426..78c479efac 100644 --- a/csit/variables/mdsal/lowlevelrpc/subscribe_ynl/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/subscribe_ynl/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:subscribe-ynl \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:subscribe-ynl diff --git a/csit/variables/mdsal/lowlevelrpc/unregister_bound_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/unregister_bound_constant/location.uri index 4c1243d250..de167b2fa4 100644 --- a/csit/variables/mdsal/lowlevelrpc/unregister_bound_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/unregister_bound_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:unregister-bound-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:unregister-bound-constant diff --git a/csit/variables/mdsal/lowlevelrpc/unregister_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/unregister_constant/location.uri index e6814696fb..f2241f0b45 100644 --- a/csit/variables/mdsal/lowlevelrpc/unregister_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/unregister_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:unregister-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:unregister-constant diff --git a/csit/variables/mdsal/lowlevelrpc/unregister_flapping_singleton/location.uri b/csit/variables/mdsal/lowlevelrpc/unregister_flapping_singleton/location.uri index 3f1177f666..532aa5e879 100644 --- a/csit/variables/mdsal/lowlevelrpc/unregister_flapping_singleton/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/unregister_flapping_singleton/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:unregister-flapping-singleton \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:unregister-flapping-singleton diff --git a/csit/variables/mdsal/lowlevelrpc/unregister_singleton_constant/location.uri b/csit/variables/mdsal/lowlevelrpc/unregister_singleton_constant/location.uri index f0e72fba26..450740993c 100644 --- a/csit/variables/mdsal/lowlevelrpc/unregister_singleton_constant/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/unregister_singleton_constant/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:unregister-singleton-constant \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:unregister-singleton-constant diff --git a/csit/variables/mdsal/lowlevelrpc/unsubscribe_ddtl/location.uri b/csit/variables/mdsal/lowlevelrpc/unsubscribe_ddtl/location.uri index 93cbe5af77..cce66e0f47 100644 --- a/csit/variables/mdsal/lowlevelrpc/unsubscribe_ddtl/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/unsubscribe_ddtl/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:unsubscribe-ddtl \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:unsubscribe-ddtl diff --git a/csit/variables/mdsal/lowlevelrpc/unsubscribe_dtcl/location.uri b/csit/variables/mdsal/lowlevelrpc/unsubscribe_dtcl/location.uri index 8850035310..a27c7bc401 100644 --- a/csit/variables/mdsal/lowlevelrpc/unsubscribe_dtcl/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/unsubscribe_dtcl/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:unsubscribe-dtcl \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:unsubscribe-dtcl diff --git a/csit/variables/mdsal/lowlevelrpc/unsubscribe_ynl/location.uri b/csit/variables/mdsal/lowlevelrpc/unsubscribe_ynl/location.uri index c2d4f5e816..d51746f3ad 100644 --- a/csit/variables/mdsal/lowlevelrpc/unsubscribe_ynl/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/unsubscribe_ynl/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:unsubscribe-ynl \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:unsubscribe-ynl diff --git a/csit/variables/mdsal/lowlevelrpc/write_transactions/location.uri b/csit/variables/mdsal/lowlevelrpc/write_transactions/location.uri index 2755958499..e76d22cadc 100644 --- a/csit/variables/mdsal/lowlevelrpc/write_transactions/location.uri +++ b/csit/variables/mdsal/lowlevelrpc/write_transactions/location.uri @@ -1 +1 @@ -/restconf/operations/odl-mdsal-lowlevel-control:write-transactions \ No newline at end of file +/rests/operations/odl-mdsal-lowlevel-control:write-transactions -- 2.36.6