[ARO] Add az aro hcp subcommand to az aro

linter_exclusions.yml

@@ -804,6 +804,21 @@ aro create:
     enable_preconfigured_nsg:
       rule_exclusions:
       - option_length_too_long
+aro hcp cluster create:
+  parameters:
+    managed_resource_group_name:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+aro identity create-required:
+  parameters:
+    vnet_resource_group_name:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+aro identity get-required:
+  parameters:
+    vnet_resource_group_name:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
 aro validate:
   parameters:
     cluster_resource_group:

src/azure-cli-core/azure/cli/core/helpIndex.latest.json

@@ -40,7 +40,7 @@
         "tags": ""
       },
       "aro": {
-        "summary": "Manage Azure Red Hat OpenShift clusters.",
+        "summary": "Manage Azure Red Hat OpenShift resource types.",
         "tags": ""
       },
       "backup": {

src/azure-cli/azure/cli/command_modules/aro/__init__.py

@@ -13,6 +13,9 @@
 from azure.cli.core.commands import CliCommandType
 from azure.cli.core.aaz import load_aaz_command_table
 from . import aaz
+from .azext_aro_hcp._help import helps as _helps  # pylint: disable=unused-import
+from .azext_aro_hcp._params import load_arguments as load_hcp_arguments
+from .azext_aro_hcp.commands import load_command_table as load_hcp_command_table
 
 
 class AroCommandsLoader(AzCommandsLoader):
@@ -34,10 +37,12 @@ def load_command_table(self, args):
             args=args
         )
         load_command_table(self, args)
+        load_hcp_command_table(self, args)
         return self.command_table
 
     def load_arguments(self, command):
         load_arguments(self, command)
+        load_hcp_arguments(self, command)
 
 
 COMMAND_LOADER_CLS = AroCommandsLoader

src/azure-cli/azure/cli/command_modules/aro/_help.py

@@ -8,12 +8,12 @@
 
 helps['aro'] = """
   type: group
-  short-summary: Manage Azure Red Hat OpenShift clusters.
+  short-summary: Manage Azure Red Hat OpenShift Standard clusters.
 """
 
 helps['aro create'] = """
   type: command
-  short-summary: Create a cluster.
+  short-summary: Create an Azure Red Hat OpenShift Standard cluster.
   examples:
   - name: Create a cluster.
     text: az aro create --resource-group MyResourceGroup --name MyCluster --vnet MyVnet --master-subnet MyMasterSubnet --worker-subnet MyWorkerSubnet
@@ -27,7 +27,7 @@
 
 helps['aro validate'] = """
   type: command
-  short-summary: Validate permissions required to create a cluster.
+  short-summary: Validate permissions required to create an Azure Red Hat OpenShift Standard cluster.
   examples:
   - name: Validate permissions.
     text: az aro validate --resource-group MyGroup --name MyName --vnet MyVnet --master-subnet MyMasterSubnet --worker-subnet MyWorkerSubnet
@@ -37,7 +37,7 @@
 
 helps['aro list'] = """
   type: command
-  short-summary: List clusters.
+  short-summary: List Azure Red Hat OpenShift Standard clusters.
   examples:
   - name: List clusters.
     text: az aro list
@@ -47,7 +47,7 @@
 
 helps['aro get-versions'] = """
   type: command
-  short-summary: List versions available for installation.
+  short-summary: List versions available for installation for Azure Red Hat OpenShift Standard clusters.
   examples:
   - name: List install versions available for the East US region.
     text: az aro get-versions --location eastus
@@ -57,63 +57,63 @@
 
 helps['aro delete'] = """
   type: command
-  short-summary: Delete a cluster.
+  short-summary: Delete an Azure Red Hat OpenShift Standard cluster.
   examples:
   - name: Delete a cluster.
     text: az aro delete --name MyCluster --resource-group MyResourceGroup
 """
 
 helps['aro show'] = """
   type: command
-  short-summary: Get the details of a cluster.
+  short-summary: Get the details of an Azure Red Hat OpenShift Standard cluster.
   examples:
   - name: Get the details of a cluster.
     text: az aro show --name MyCluster --resource-group MyResourceGroup
 """
 
 helps['aro update'] = """
   type: command
-  short-summary: Update a cluster.
+  short-summary: Update an Azure Red Hat OpenShift Standard cluster.
   examples:
   - name: Update a cluster.
     text: az aro update --name MyCluster --resource-group MyResourceGroup
 """
 
 helps['aro list-credentials'] = """
   type: command
-  short-summary: List credentials of a cluster.
+  short-summary: List credentials of an Azure Red Hat OpenShift Standard cluster.
   examples:
   - name: List credentials of a cluster.
     text: az aro list-credentials --name MyCluster --resource-group MyResourceGroup
 """
 
 helps['aro get-admin-kubeconfig'] = """
   type: command
-  short-summary: List admin kubeconfig of a cluster.
+  short-summary: List admin kubeconfig of an Azure Red Hat OpenShift Standard cluster.
   examples:
   - name: List admin kubeconfig of a cluster. The default is to save it in a file named "kubeconfig".
     text: az aro get-admin-kubeconfig --name MyCluster --resource-group MyResourceGroup
 """
 
 helps['aro wait'] = """
   type: command
-  short-summary: Wait for a cluster to reach a desired state.
+  short-summary: Wait for an Azure Red Hat OpenShift Standard cluster to reach a desired state.
   long-summary: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
 """
 
 helps['aro identity'] = """
   type: group
-  short-summary: Manage identities related to Azure Red Hat OpenShift clusters.
+  short-summary: Manage identities related to Azure Red Hat OpenShift Standard clusters.
 """
 
 helps['aro identity get-required'] = """
   type: command
   short-summary: Get required identities
-  long-summary: Get required identities for creating a cluster with managed identities.
+  long-summary: Get required identities for creating an Azure Red Hat OpenShift Standard cluster with managed identities.
 """
 
 helps['aro identity create-required'] = """
   type: command
   short-summary: Create required identities
-  long-summary: Create required identities to prepare for creating a cluster with managed identities.
+  long-summary: Create required identities to prepare for creating an Azure Red Hat OpenShift Standard cluster with managed identities.
 """

src/azure-cli/azure/cli/command_modules/aro/aaz/latest/aro/__cmd_group.py

@@ -0,0 +1,23 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from azure.cli.core.aaz import *
+
+
+@register_command_group(
+    "aro",
+)
+class __CMDGroup(AAZCommandGroup):
+    """Manage Azure Red Hat OpenShift resource types
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

src/azure-cli/azure/cli/command_modules/aro/aaz/latest/aro/__init__.py

@@ -0,0 +1,11 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from .__cmd_group import *

src/azure-cli/azure/cli/command_modules/aro/aaz/latest/aro/hcp/__cmd_group.py

@@ -0,0 +1,23 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from azure.cli.core.aaz import *
+
+
+@register_command_group(
+    "aro hcp",
+)
+class __CMDGroup(AAZCommandGroup):
+    """Manage Azure Red Hat OpenShift with hosted control plane resource types
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

src/azure-cli/azure/cli/command_modules/aro/aaz/latest/aro/hcp/__init__.py

@@ -0,0 +1,12 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from .__cmd_group import *
+from ._get_versions import *