This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 86039e8302 HDDS-12848. Create new submodule for ozone admin (#8292)
86039e8302 is described below
commit 86039e8302d859d62c078ef23e01efc640397e72
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Apr 29 19:56:53 2025 +0200
HDDS-12848. Create new submodule for ozone admin (#8292)
---
.../apache/hadoop/hdds/cli/AdminSubcommand.java | 0
.../apache/hadoop/hdds/cli/DebugSubcommand.java | 0
.../org/apache/hadoop/hdds/cli/ItemsFromStdin.java | 0
.../apache/hadoop/hdds/cli/RepairSubcommand.java | 0
.../hadoop/ozone/utils/FormattingCLIUtils.java | 0
.../apache/hadoop/ozone/utils}/package-info.java | 4 +-
hadoop-hdds/pom.xml | 6 ---
.../tools => hadoop-ozone/cli-admin}/pom.xml | 61 +++++++++++-----------
.../hdds/scm/cli/ContainerBalancerCommands.java | 0
.../scm/cli/ContainerBalancerStartSubcommand.java | 0
.../scm/cli/ContainerBalancerStatusSubcommand.java | 0
.../scm/cli/ContainerBalancerStopSubcommand.java | 0
.../hdds/scm/cli/ContainerOperationClient.java | 0
.../hdds/scm/cli/ReplicationManagerCommands.java | 0
.../scm/cli/ReplicationManagerStartSubcommand.java | 0
.../cli/ReplicationManagerStatusSubcommand.java | 0
.../scm/cli/ReplicationManagerStopSubcommand.java | 0
.../hdds/scm/cli/SafeModeCheckSubcommand.java | 0
.../hadoop/hdds/scm/cli/SafeModeCommands.java | 0
.../hdds/scm/cli/SafeModeExitSubcommand.java | 0
.../hdds/scm/cli/SafeModeWaitSubcommand.java | 0
.../org/apache/hadoop/hdds/scm/cli/ScmOption.java | 0
.../apache/hadoop/hdds/scm/cli/ScmSubcommand.java | 0
.../hadoop/hdds/scm/cli/TopologySubcommand.java | 0
.../hadoop/hdds/scm/cli/cert/CertCommands.java | 0
.../scm/cli/cert/CleanExpiredCertsSubcommand.java | 0
.../hadoop/hdds/scm/cli/cert/InfoSubcommand.java | 0
.../hadoop/hdds/scm/cli/cert/ListSubcommand.java | 0
.../hdds/scm/cli/cert/ScmCertSubcommand.java | 0
.../hadoop/hdds/scm/cli/cert/package-info.java | 0
.../hdds/scm/cli/container/CloseSubcommand.java | 0
.../hdds/scm/cli/container/ContainerCommands.java | 0
.../scm/cli/container/ContainerIDParameters.java | 0
.../hdds/scm/cli/container/CreateSubcommand.java | 0
.../hdds/scm/cli/container/InfoSubcommand.java | 0
.../hdds/scm/cli/container/ListSubcommand.java | 0
.../hdds/scm/cli/container/ReportSubcommand.java | 0
.../hdds/scm/cli/container/UpgradeSubcommand.java | 0
.../hdds/scm/cli/container/package-info.java | 0
.../hdds/scm/cli/datanode/DatanodeCommands.java | 0
.../cli/datanode/DecommissionStatusSubCommand.java | 0
.../scm/cli/datanode/DecommissionSubCommand.java | 0
.../hdds/scm/cli/datanode/HostNameParameters.java | 0
.../hdds/scm/cli/datanode/ListInfoSubcommand.java | 0
.../scm/cli/datanode/MaintenanceSubCommand.java | 0
.../scm/cli/datanode/RecommissionSubCommand.java | 0
.../hdds/scm/cli/datanode/StatusSubCommand.java | 0
.../hdds/scm/cli/datanode/UsageInfoSubcommand.java | 0
.../hadoop/hdds/scm/cli/datanode/package-info.java | 0
.../apache/hadoop/hdds/scm/cli/package-info.java | 0
.../cli/pipeline/ActivatePipelineSubcommand.java | 0
.../scm/cli/pipeline/ClosePipelineSubcommand.java | 0
.../scm/cli/pipeline/CreatePipelineSubcommand.java | 0
.../cli/pipeline/DeactivatePipelineSubcommand.java | 0
.../scm/cli/pipeline/FilterPipelineOptions.java | 0
.../scm/cli/pipeline/ListPipelinesSubcommand.java | 0
.../hdds/scm/cli/pipeline/PipelineCommands.java | 0
.../hadoop/hdds/scm/cli/pipeline/package-info.java | 0
.../org/apache/hadoop/hdds/util/DurationUtil.java | 0
.../org/apache/hadoop/hdds/util/package-info.java | 0
.../org/apache/hadoop/ozone/admin/OzoneAdmin.java | 0
.../ozone/admin/nssummary/DiskUsageSubCommand.java | 0
.../admin/nssummary/FileSizeDistSubCommand.java | 0
.../ozone/admin/nssummary/NSSummaryAdmin.java | 0
.../ozone/admin/nssummary/NSSummaryCLIUtils.java | 0
.../admin/nssummary/QuotaUsageSubCommand.java | 0
.../ozone/admin/nssummary/SummarySubCommand.java | 0
.../hadoop/ozone/admin/nssummary/package-info.java | 0
.../ozone/admin/om/CancelPrepareSubCommand.java | 0
.../ozone/admin/om/DecommissionOMSubcommand.java | 0
.../hadoop/ozone/admin/om/FetchKeySubCommand.java | 0
.../admin/om/FinalizationStatusSubCommand.java | 0
.../ozone/admin/om/FinalizeUpgradeSubCommand.java | 0
.../ozone/admin/om/GetServiceRolesSubcommand.java | 0
.../ozone/admin/om/ListOpenFilesSubCommand.java | 0
.../org/apache/hadoop/ozone/admin/om/OMAdmin.java | 0
.../hadoop/ozone/admin/om/PrepareSubCommand.java | 0
.../ozone/admin/om/TransferOmLeaderSubCommand.java | 0
.../ozone/admin/om/UpdateRangerSubcommand.java | 0
.../ozone/admin/om/lease/LeaseRecoverer.java | 0
.../ozone/admin/om/lease/LeaseSubCommand.java | 0
.../hadoop/ozone/admin/om/lease/package-info.java | 0
.../apache/hadoop/ozone/admin/om/package-info.java | 0
.../apache/hadoop/ozone/admin/package-info.java | 0
.../reconfig/AbstractReconfigureSubCommand.java | 0
.../ozone/admin/reconfig/ReconfigureCommands.java | 0
.../reconfig/ReconfigurePropertiesSubcommand.java | 0
.../admin/reconfig/ReconfigureStartSubcommand.java | 0
.../reconfig/ReconfigureStatusSubcommand.java | 0
.../admin/reconfig/ReconfigureSubCommandUtil.java | 0
.../hadoop/ozone/admin/reconfig/package-info.java | 0
.../ozone/admin/scm/DecommissionScmSubcommand.java | 0
.../ozone/admin/scm/DeletedBlocksTxnCommands.java | 0
.../admin/scm/FinalizationScmStatusSubcommand.java | 0
.../admin/scm/FinalizeScmUpgradeSubcommand.java | 0
.../scm/GetFailedDeletedBlocksTxnSubcommand.java | 0
.../admin/scm/GetScmRatisRolesSubcommand.java | 0
.../scm/ResetDeletedBlockRetryCountSubcommand.java | 0
.../ozone/admin/scm/RotateKeySubCommand.java | 0
.../apache/hadoop/ozone/admin/scm/ScmAdmin.java | 0
.../admin/scm/TransferScmLeaderSubCommand.java | 0
.../hadoop/ozone/admin/scm/package-info.java | 0
.../cli/cert/TestCleanExpiredCertsSubcommand.java | 0
.../hdds/scm/cli/container/TestInfoSubCommand.java | 0
.../scm/cli/container/TestReportSubCommand.java | 0
.../datanode/TestContainerBalancerSubCommand.java | 0
.../datanode/TestDecommissionStatusSubCommand.java | 0
.../cli/datanode/TestDecommissionSubCommand.java | 0
.../scm/cli/datanode/TestListInfoSubcommand.java | 0
.../cli/datanode/TestMaintenanceSubCommand.java | 0
.../cli/datanode/TestRecommissionSubCommand.java | 0
.../scm/cli/datanode/TestUsageInfoSubcommand.java | 0
.../cli/pipeline/TestClosePipelinesSubCommand.java | 0
.../cli/pipeline/TestListPipelinesSubCommand.java | 0
.../apache/hadoop/hdds/util/TestDurationUtil.java | 0
.../ozone/scm/TestDecommissionScmSubcommand.java | 0
.../ozone/scm/TestGetScmRatisRolesSubcommand.java | 0
.../org/apache/hadoop/ozone/scm/package-info.java | 0
hadoop-ozone/dist/pom.xml | 2 +-
hadoop-ozone/dist/src/main/license/jar-report.txt | 2 +-
hadoop-ozone/dist/src/shell/ozone/ozone | 2 +-
hadoop-ozone/insight/pom.xml | 2 +-
hadoop-ozone/integration-test/pom.xml | 2 +-
hadoop-ozone/pom.xml | 7 +--
hadoop-ozone/recon/pom.xml | 2 +-
hadoop-ozone/tools/pom.xml | 14 +++--
126 files changed, 51 insertions(+), 53 deletions(-)
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/AdminSubcommand.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/AdminSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/AdminSubcommand.java
rename to
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/AdminSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/DebugSubcommand.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/DebugSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/DebugSubcommand.java
rename to
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/DebugSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/ItemsFromStdin.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/ItemsFromStdin.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/ItemsFromStdin.java
rename to
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/ItemsFromStdin.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/RepairSubcommand.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/RepairSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/RepairSubcommand.java
rename to
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/RepairSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/utils/FormattingCLIUtils.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/utils/FormattingCLIUtils.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/utils/FormattingCLIUtils.java
rename to
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/utils/FormattingCLIUtils.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/package-info.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/utils/package-info.java
similarity index 92%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/package-info.java
rename to
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/utils/package-info.java
index 9be6130640..eef194f011 100644
---
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/package-info.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/utils/package-info.java
@@ -16,6 +16,6 @@
*/
/**
- * Command-line tools for HDDS.
+ * Utility classes for Ozone.
*/
-package org.apache.hadoop.hdds.cli;
+package org.apache.hadoop.ozone.utils;
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 060c6fa044..2b10886aaf 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -47,7 +47,6 @@
<module>rocksdb-checkpoint-differ</module>
<module>server-scm</module>
<module>test-utils</module>
- <module>tools</module>
</modules>
<dependencyManagement>
@@ -168,11 +167,6 @@
<version>${hdds.version}</version>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
- <version>${hdds.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>rocksdb-checkpoint-differ</artifactId>
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-ozone/cli-admin/pom.xml
similarity index 87%
rename from hadoop-hdds/tools/pom.xml
rename to hadoop-ozone/cli-admin/pom.xml
index d7c244bc57..70babe687c 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-ozone/cli-admin/pom.xml
@@ -16,21 +16,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds</artifactId>
+ <artifactId>ozone</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <artifactId>hdds-tools</artifactId>
+ <artifactId>ozone-cli-admin</artifactId>
<version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Apache Ozone HDDS Tools</name>
- <description>Apache Ozone Distributed Data Store Tools</description>
+ <name>Apache Ozone CLI Admin</name>
+ <description>Apache Ozone CLI Admin</description>
+
+ <properties>
+ <classpath.skip>false</classpath.skip>
+ </properties>
<dependencies>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@ -51,10 +51,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -81,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
+ <artifactId>hdds-hadoop-dependency-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -92,39 +88,42 @@
<artifactId>hdds-interface-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-common</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-tools</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-examples</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-cli-shell</artifactId>
</dependency>
<dependency>
- <groupId>org.kohsuke.metainf-services</groupId>
- <artifactId>metainf-services</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-client</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-interface-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-common</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
+ <groupId>org.kohsuke.metainf-services</groupId>
+ <artifactId>metainf-services</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<!-- Test dependencies -->
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerCommands.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerCommands.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStopSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStopSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStopSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStopSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerCommands.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerCommands.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStartSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStartSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStartSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStartSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStatusSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStatusSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStatusSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStatusSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStopSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStopSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStopSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStopSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCommands.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCommands.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeExitSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeExitSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeExitSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeExitSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeWaitSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeWaitSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeWaitSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeWaitSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ScmOption.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ScmOption.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ScmOption.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ScmOption.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ScmSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ScmSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ScmSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ScmSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/TopologySubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/TopologySubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/TopologySubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/TopologySubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/CertCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/CertCommands.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/CertCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/CertCommands.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/CleanExpiredCertsSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/CleanExpiredCertsSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/CleanExpiredCertsSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/CleanExpiredCertsSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/InfoSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/InfoSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/InfoSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/InfoSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/ListSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/ListSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/ListSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/ListSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/ScmCertSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/ScmCertSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/ScmCertSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/ScmCertSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/package-info.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/cert/package-info.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerCommands.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerCommands.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerIDParameters.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerIDParameters.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerIDParameters.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ContainerIDParameters.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CreateSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CreateSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CreateSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CreateSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/InfoSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ListSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ListSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ListSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ListSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ReportSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ReportSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ReportSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ReportSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/UpgradeSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/UpgradeSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/UpgradeSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/UpgradeSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/package-info.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/package-info.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DatanodeCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DatanodeCommands.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DatanodeCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DatanodeCommands.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionSubCommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/HostNameParameters.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/HostNameParameters.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/HostNameParameters.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/HostNameParameters.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/MaintenanceSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/MaintenanceSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/MaintenanceSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/MaintenanceSubCommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/RecommissionSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/RecommissionSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/RecommissionSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/RecommissionSubCommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/StatusSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/StatusSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/StatusSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/StatusSubCommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/UsageInfoSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/UsageInfoSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/UsageInfoSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/UsageInfoSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/package-info.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/package-info.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/package-info.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/package-info.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ActivatePipelineSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ActivatePipelineSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ActivatePipelineSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ActivatePipelineSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ClosePipelineSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ClosePipelineSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ClosePipelineSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ClosePipelineSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/DeactivatePipelineSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/DeactivatePipelineSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/DeactivatePipelineSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/DeactivatePipelineSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/FilterPipelineOptions.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/FilterPipelineOptions.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/FilterPipelineOptions.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/FilterPipelineOptions.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/PipelineCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/PipelineCommands.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/PipelineCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/PipelineCommands.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/package-info.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/package-info.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/util/DurationUtil.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/util/DurationUtil.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/util/DurationUtil.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/util/DurationUtil.java
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/util/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/util/package-info.java
similarity index 100%
rename from
hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/util/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/util/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/OzoneAdmin.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/OzoneAdmin.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/OzoneAdmin.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/OzoneAdmin.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/DiskUsageSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/DiskUsageSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/DiskUsageSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/DiskUsageSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/FileSizeDistSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/FileSizeDistSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/FileSizeDistSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/FileSizeDistSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryCLIUtils.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryCLIUtils.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryCLIUtils.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryCLIUtils.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/QuotaUsageSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/QuotaUsageSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/QuotaUsageSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/QuotaUsageSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/SummarySubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/SummarySubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/SummarySubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/SummarySubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/nssummary/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/CancelPrepareSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/CancelPrepareSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/CancelPrepareSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/CancelPrepareSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/DecommissionOMSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/DecommissionOMSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/DecommissionOMSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/DecommissionOMSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FetchKeySubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/FetchKeySubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FetchKeySubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/FetchKeySubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizationStatusSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizationStatusSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizationStatusSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizationStatusSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizeUpgradeSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizeUpgradeSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizeUpgradeSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/FinalizeUpgradeSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/ListOpenFilesSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/ListOpenFilesSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/ListOpenFilesSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/ListOpenFilesSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/PrepareSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/PrepareSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/PrepareSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/PrepareSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/UpdateRangerSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/lease/LeaseRecoverer.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/lease/LeaseRecoverer.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/lease/LeaseRecoverer.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/lease/LeaseRecoverer.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/lease/LeaseSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/lease/LeaseSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/lease/LeaseSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/lease/LeaseSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/lease/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/lease/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/lease/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/lease/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/AbstractReconfigureSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/AbstractReconfigureSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/AbstractReconfigureSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/AbstractReconfigureSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureCommands.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureCommands.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigurePropertiesSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigurePropertiesSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigurePropertiesSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigurePropertiesSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureStartSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureStartSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureStartSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureStartSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureStatusSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureStatusSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureStatusSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureStatusSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureSubCommandUtil.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureSubCommandUtil.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureSubCommandUtil.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/ReconfigureSubCommandUtil.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/reconfig/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/reconfig/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/DecommissionScmSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/DecommissionScmSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/DecommissionScmSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/DecommissionScmSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/DeletedBlocksTxnCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/DeletedBlocksTxnCommands.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/DeletedBlocksTxnCommands.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/DeletedBlocksTxnCommands.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizationScmStatusSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizationScmStatusSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizationScmStatusSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizationScmStatusSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeScmUpgradeSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeScmUpgradeSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeScmUpgradeSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/FinalizeScmUpgradeSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetScmRatisRolesSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/GetScmRatisRolesSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetScmRatisRolesSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/GetScmRatisRolesSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ResetDeletedBlockRetryCountSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/ResetDeletedBlockRetryCountSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ResetDeletedBlockRetryCountSubcommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/ResetDeletedBlockRetryCountSubcommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/RotateKeySubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/RotateKeySubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/RotateKeySubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/RotateKeySubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/package-info.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/package-info.java
rename to
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/package-info.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestMaintenanceSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestMaintenanceSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestMaintenanceSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestMaintenanceSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestRecommissionSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestRecommissionSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestRecommissionSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestRecommissionSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestClosePipelinesSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestClosePipelinesSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestClosePipelinesSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestClosePipelinesSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestListPipelinesSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestListPipelinesSubCommand.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestListPipelinesSubCommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestListPipelinesSubCommand.java
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/util/TestDurationUtil.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/util/TestDurationUtil.java
similarity index 100%
rename from
hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/util/TestDurationUtil.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/util/TestDurationUtil.java
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestDecommissionScmSubcommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/scm/TestDecommissionScmSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestDecommissionScmSubcommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/scm/TestDecommissionScmSubcommand.java
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestGetScmRatisRolesSubcommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/scm/TestGetScmRatisRolesSubcommand.java
similarity index 100%
rename from
hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestGetScmRatisRolesSubcommand.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/scm/TestGetScmRatisRolesSubcommand.java
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/package-info.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/scm/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/package-info.java
rename to
hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/ozone/scm/package-info.java
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 49d7419598..69798f43b8 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
+ <artifactId>ozone-cli-admin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 12019399d9..2b3c85c3bf 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -81,7 +81,6 @@ share/ozone/lib/hdds-rocks-native.jar
share/ozone/lib/hdds-managed-rocksdb.jar
share/ozone/lib/hdds-server-framework.jar
share/ozone/lib/hdds-server-scm.jar
-share/ozone/lib/hdds-tools.jar
share/ozone/lib/hk2-api.jar
share/ozone/lib/hk2-locator.jar
share/ozone/lib/hk2-utils.jar
@@ -219,6 +218,7 @@ share/ozone/lib/orc-core.jar
share/ozone/lib/orc-shims.jar
share/ozone/lib/osgi-resource-locator.jar
share/ozone/lib/ozone-client.jar
+share/ozone/lib/ozone-cli-admin.jar
share/ozone/lib/ozone-cli-shell.jar
share/ozone/lib/ozone-common.jar
share/ozone/lib/ozone-csi.jar
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone
b/hadoop-ozone/dist/src/shell/ozone/ozone
index 331da1effd..b5ba95ddc6 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -215,7 +215,7 @@ function ozonecmd_case
admin)
OZONE_CLASSNAME=org.apache.hadoop.ozone.admin.OzoneAdmin
OZONE_ADMIN_OPTS="${OZONE_ADMIN_OPTS} ${RATIS_OPTS}
${OZONE_MODULE_ACCESS_ARGS}"
- OZONE_RUN_ARTIFACT_NAME="ozone-tools"
+ OZONE_RUN_ARTIFACT_NAME="ozone-cli-admin"
;;
debug)
OZONE_CLASSNAME=org.apache.hadoop.ozone.debug.OzoneDebug
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index 69a7c86b36..304bc958e4 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
+ <artifactId>ozone-cli-admin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
diff --git a/hadoop-ozone/integration-test/pom.xml
b/hadoop-ozone/integration-test/pom.xml
index f24f0253de..1a75de9301 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
+ <artifactId>ozone-cli-admin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 7298e26ec6..a0745cb481 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -25,6 +25,7 @@
<name>Apache Ozone</name>
<description>Apache Ozone Project</description>
<modules>
+ <module>cli-admin</module>
<module>cli-shell</module>
<module>client</module>
<module>common</module>
@@ -173,8 +174,8 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-cli-admin</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -245,7 +246,7 @@
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-insight</artifactId>
- <version>${hdds.version}</version>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 119e992607..13a5108bae 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -149,7 +149,7 @@
<!-- visible only for ContainerOperationClient -->
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
+ <artifactId>ozone-cli-admin</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 46ef925f9b..dcbc5637ab 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -30,6 +30,10 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
@@ -130,10 +134,6 @@
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-server</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-admin</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-client</artifactId>
@@ -156,7 +156,7 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
+ <artifactId>ozone-cli-admin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -252,6 +252,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
