From 23d182ceddc9bcdb0b7a1c9c59a8367c16954ff8 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 11 Oct 2019 14:40:18 -0700
Subject: [PATCH] rgw-admin: adjust commands

Add missing definitions needed for backward compatibility.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---
 src/rgw/rgw_admin.cc | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 036cd357f10..dc88e7c41db 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -725,6 +725,7 @@ static SimpleCmd::Commands all_cmds = {
   { "key create", OPT::KEY_CREATE },
   { "key rm", OPT::KEY_RM },
   { "buckets list", OPT::BUCKETS_LIST },
+  { "bucket list", OPT::BUCKETS_LIST },
   { "bucket limit check", OPT::BUCKET_LIMIT_CHECK },
   { "bucket link", OPT::BUCKET_LINK },
   { "bucket unlink", OPT::BUCKET_UNLINK },
@@ -743,6 +744,7 @@ static SimpleCmd::Commands all_cmds = {
   { "policy", OPT::POLICY },
   { "pool add", OPT::POOL_ADD },
   { "pool rm", OPT::POOL_RM },
+  { "pool list", OPT::POOLS_LIST },
   { "pools list", OPT::POOLS_LIST },
   { "log list", OPT::LOG_LIST },
   { "log show", OPT::LOG_SHOW },
@@ -756,8 +758,8 @@ static SimpleCmd::Commands all_cmds = {
   { "object stat", OPT::OBJECT_STAT },
   { "object rewrite", OPT::OBJECT_REWRITE },
   { "objects expire", OPT::OBJECTS_EXPIRE },
-  { "objects expire stale list", OPT::OBJECTS_EXPIRE_STALE_LIST },
-  { "objects expire stale rm", OPT::OBJECTS_EXPIRE_STALE_RM },
+  { "objects expire-stale list", OPT::OBJECTS_EXPIRE_STALE_LIST },
+  { "objects expire-stale rm", OPT::OBJECTS_EXPIRE_STALE_RM },
   { "bi get", OPT::BI_GET },
   { "bi put", OPT::BI_PUT },
   { "bi list", OPT::BI_LIST },
@@ -776,6 +778,7 @@ static SimpleCmd::Commands all_cmds = {
   { "orphans find", OPT::ORPHANS_FIND },
   { "orphans finish", OPT::ORPHANS_FINISH },
   { "orphans list jobs", OPT::ORPHANS_LIST_JOBS },
+  { "orphans list-jobs", OPT::ORPHANS_LIST_JOBS },
   { "zonegroup add", OPT::ZONEGROUP_ADD },
   { "zonegroup create", OPT::ZONEGROUP_CREATE },
   { "zonegroup default", OPT::ZONEGROUP_DEFAULT },
@@ -784,6 +787,7 @@ static SimpleCmd::Commands all_cmds = {
   { "zonegroup modify", OPT::ZONEGROUP_MODIFY },
   { "zonegroup set", OPT::ZONEGROUP_SET },
   { "zonegroup list", OPT::ZONEGROUP_LIST },
+  { "zonegroups list", OPT::ZONEGROUP_LIST },
   { "zonegroup remove", OPT::ZONEGROUP_REMOVE },
   { "zonegroup rename", OPT::ZONEGROUP_RENAME },
   { "zonegroup placement add", OPT::ZONEGROUP_PLACEMENT_ADD },
@@ -798,6 +802,7 @@ static SimpleCmd::Commands all_cmds = {
   { "zone modify", OPT::ZONE_MODIFY },
   { "zone set", OPT::ZONE_SET },
   { "zone list", OPT::ZONE_LIST },
+  { "zones list", OPT::ZONE_LIST },
   { "zone rename", OPT::ZONE_RENAME },
   { "zone default", OPT::ZONE_DEFAULT },
   { "zone placement add", OPT::ZONE_PLACEMENT_ADD },
@@ -836,14 +841,17 @@ static SimpleCmd::Commands all_cmds = {
   { "realm delete", OPT::REALM_DELETE },
   { "realm get", OPT::REALM_GET },
   { "realm get default", OPT::REALM_GET_DEFAULT },
+  { "realm get-default", OPT::REALM_GET_DEFAULT },
   { "realm list", OPT::REALM_LIST },
   { "realm list periods", OPT::REALM_LIST_PERIODS },
+  { "realm list-periods", OPT::REALM_LIST_PERIODS },
   { "realm rename", OPT::REALM_RENAME },
   { "realm set", OPT::REALM_SET },
   { "realm default", OPT::REALM_DEFAULT },
   { "realm pull", OPT::REALM_PULL },
   { "period delete", OPT::PERIOD_DELETE },
   { "period get", OPT::PERIOD_GET },
+  { "period get-current", OPT::PERIOD_GET_CURRENT },
   { "period get current", OPT::PERIOD_GET_CURRENT },
   { "period pull", OPT::PERIOD_PULL },
   { "period push", OPT::PERIOD_PUSH },
@@ -861,9 +869,14 @@ static SimpleCmd::Commands all_cmds = {
   { "role modify", OPT::ROLE_MODIFY },
   { "role list", OPT::ROLE_LIST },
   { "role policy put", OPT::ROLE_POLICY_PUT },
+  { "role-policy put", OPT::ROLE_POLICY_PUT },
   { "role policy list", OPT::ROLE_POLICY_LIST },
+  { "role-policy list", OPT::ROLE_POLICY_LIST },
   { "role policy get", OPT::ROLE_POLICY_GET },
+  { "role-policy get", OPT::ROLE_POLICY_GET },
   { "role policy delete", OPT::ROLE_POLICY_DELETE },
+  { "role-policy delete", OPT::ROLE_POLICY_DELETE },
+  { "reshard bucket", OPT::BUCKET_RESHARD },
   { "reshard add", OPT::RESHARD_ADD },
   { "reshard list", OPT::RESHARD_LIST },
   { "reshard status", OPT::RESHARD_STATUS },
@@ -875,8 +888,10 @@ static SimpleCmd::Commands all_cmds = {
   { "mfa list", OPT::MFA_LIST },
   { "mfa check", OPT::MFA_CHECK },
   { "mfa resync", OPT::MFA_RESYNC },
-  { "reshard stale instances list", OPT::RESHARD_STALE_INSTANCES_LIST },
-  { "reshard stale instances delete", OPT::RESHARD_STALE_INSTANCES_DELETE },
+  { "reshard stale-instances list", OPT::RESHARD_STALE_INSTANCES_LIST },
+  { "reshard stale list", OPT::RESHARD_STALE_INSTANCES_LIST },
+  { "reshard stale-instances delete", OPT::RESHARD_STALE_INSTANCES_DELETE },
+  { "reshard stale delete", OPT::RESHARD_STALE_INSTANCES_DELETE },
   { "pubsub topics list", OPT::PUBSUB_TOPICS_LIST },
   { "pubsub topic create", OPT::PUBSUB_TOPIC_CREATE },
   { "pubsub topic get", OPT::PUBSUB_TOPIC_GET },
-- 
2.39.5