[AutoPR managementgroup] Microsoft.Management 2020-05-01 apiversion

src/managementgroup/azext_managementgroup/generated/_help.py

@@ -51,8 +51,8 @@
     examples:
       - name: PutManagementGroup
         text: |-
-               az managementgroup management-group create --cache-control "no-cache" --display-name "ChildGroup" --grou\
-p-id "ChildGroup"
+               az managementgroup management-group create --cache-control "no-cache" --display-name "ChildGroup" --deta\
+ils-parent-id "/providers/Microsoft.Management/managementGroups/RootGroup" --group-id "ChildGroup"
 """
 
 helps['managementgroup management-group update'] = """
@@ -62,7 +62,7 @@
       - name: PatchManagementGroup
         text: |-
                az managementgroup management-group update --cache-control "no-cache" --group-id "ChildGroup" --display-\
-name "AlternateDisplayName"
+name "AlternateDisplayName" --parent-group-id "/providers/Microsoft.Management/managementGroups/AlternateRootGroup"
 """
 
 helps['managementgroup management-group delete'] = """
@@ -124,6 +124,26 @@
 subscription-id "728bcbe4-8d56-4510-86c2-4921b8beefbc"
 """
 
+helps['managementgroup management-group-subscription get-subscription'] = """
+    type: command
+    short-summary: Retrieves details about given subscription which is associated with the management group.
+    examples:
+      - name: GetSubscriptionFromManagementGroup
+        text: |-
+               az managementgroup management-group-subscription get-subscription --cache-control "no-cache" --group-id \
+"Group" --subscription-id "728bcbe4-8d56-4510-86c2-4921b8beefbc"
+"""
+
+helps['managementgroup management-group-subscription get-subscription-under-management-group'] = """
+    type: command
+    short-summary: Retrieves details about all subscriptions which are associated with the management group.
+    examples:
+      - name: GetAllSubscriptionsFromManagementGroup
+        text: |-
+               az managementgroup management-group-subscription get-subscription-under-management-group --group-id "Gro\
+up"
+"""
+
 helps['managementgroup hierarchy-setting'] = """
     type: group
     short-summary: managementgroup hierarchy-setting

src/managementgroup/azext_managementgroup/generated/_params.py

@@ -7,6 +7,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=line-too-long
 # pylint: disable=too-many-lines
 # pylint: disable=too-many-statements
 
@@ -46,8 +47,8 @@ def load_arguments(self, _):
         c.argument('group_id', help='Management Group ID.')
         c.argument('cache_control', help='Indicates that the request shouldn\'t utilize any caches.')
         c.argument('display_name', help='The friendly name of the management group.')
-        c.argument('parent_id', help='(Optional) The fully qualified ID for the parent management group.  For example, '
-                   '/providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000')
+        c.argument('parent_group_id', help='(Optional) The fully qualified ID for the parent management group.  For exa'
+                   'mple, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000')
 
     with self.argument_context('managementgroup management-group delete') as c:
         c.argument('group_id', help='Management Group ID.')
@@ -78,6 +79,14 @@ def load_arguments(self, _):
         c.argument('subscription_id', help='Subscription ID.', id_part='subscription')
         c.argument('cache_control', help='Indicates that the request shouldn\'t utilize any caches.')
 
+    with self.argument_context('managementgroup management-group-subscription get-subscription') as c:
+        c.argument('group_id', help='Management Group ID.')
+        c.argument('subscription_id', help='Subscription ID.', id_part='subscription')
+        c.argument('cache_control', help='Indicates that the request shouldn\'t utilize any caches.')
+
+    with self.argument_context('managementgroup management-group-subscription get-subscription-under-management-group') as c:
+        c.argument('group_id', help='Management Group ID.')
+
     with self.argument_context('managementgroup hierarchy-setting list') as c:
         c.argument('group_id', help='Management Group ID.')
 

src/managementgroup/azext_managementgroup/generated/commands.py

@@ -38,6 +38,9 @@ def load_command_table(self, _):
                             client_factory=cf_management_group_subscription, is_experimental=True) as g:
         g.custom_command('create', 'managementgroup_management_group_subscription_create')
         g.custom_command('delete', 'managementgroup_management_group_subscription_delete')
+        g.custom_command('get-subscription', 'managementgroup_management_group_subscription_get_subscription')
+        g.custom_command('get-subscription-under-management-group', 'managementgroup_management_group_subscription_get_'
+                         'subscription_under_management_group')
 
     from azext_managementgroup.generated._client_factory import cf_hierarchy_setting
     managementgroup_hierarchy_setting = CliCommandType(

src/managementgroup/azext_managementgroup/generated/custom.py

@@ -56,13 +56,13 @@ def managementgroup_management_group_update(client,
                                             group_id,
                                             cache_control=None,
                                             display_name=None,
-                                            parent_id=None):
+                                            parent_group_id=None):
     if cache_control == None:
         cache_control = "no-cache"
     return client.update(group_id=group_id,
                          cache_control=cache_control,
                          display_name=display_name,
-                         parent_id=parent_id)
+                         parent_group_id=parent_group_id)
 
 
 def managementgroup_management_group_delete(client,
@@ -104,6 +104,22 @@ def managementgroup_management_group_subscription_delete(client,
                          cache_control=cache_control)
 
 
+def managementgroup_management_group_subscription_get_subscription(client,
+                                                                   group_id,
+                                                                   subscription_id,
+                                                                   cache_control=None):
+    if cache_control == None:
+        cache_control = "no-cache"
+    return client.get_subscription(group_id=group_id,
+                                   subscription_id=subscription_id,
+                                   cache_control=cache_control)
+
+
+def managementgroup_management_group_subscription_get_subscription_under_management_group(client,
+                                                                                          group_id):
+    return client.get_subscription_under_management_group(group_id=group_id)
+
+
 def managementgroup_hierarchy_setting_list(client,
                                            group_id):
     return client.list(group_id=group_id)

src/managementgroup/azext_managementgroup/tests/latest/test_managementgroup_scenario.py

@@ -74,12 +74,31 @@ def step__managementgroupsubscriptions_put_addsubscriptiontomanagementgroup(test
              checks=[])
 
 
+# EXAMPLE: /ManagementGroupSubscriptions/get/GetAllSubscriptionsFromManagementGroup
+@try_manual
+def step__managementgroupsubscriptions_get_getallsubscriptionsfrommanagementgroup(test):
+    test.cmd('az managementgroup management-group-subscription get-subscription-under-management-group '
+             '--group-id "Group"',
+             checks=[])
+
+
+# EXAMPLE: /ManagementGroupSubscriptions/get/GetSubscriptionFromManagementGroup
+@try_manual
+def step__managementgroupsubscriptions_get_getsubscriptionfrommanagementgroup(test):
+    test.cmd('az managementgroup management-group-subscription get-subscription '
+             '--cache-control "no-cache" '
+             '--group-id "Group" '
+             '--subscription-id "728bcbe4-8d56-4510-86c2-4921b8beefbc"',
+             checks=[])
+
+
 # EXAMPLE: /ManagementGroups/put/PutManagementGroup
 @try_manual
 def step__managementgroups_put_putmanagementgroup(test):
     test.cmd('az managementgroup management-group create '
              '--cache-control "no-cache" '
              '--display-name "ChildGroup" '
+             '--details-parent-id "/providers/Microsoft.Management/managementGroups/RootGroup" '
              '--group-id "ChildGroup"',
              checks=[])
 
@@ -136,7 +155,8 @@ def step__managementgroups_patch_patchmanagementgroup(test):
     test.cmd('az managementgroup management-group update '
              '--cache-control "no-cache" '
              '--group-id "ChildGroup" '
-             '--display-name "AlternateDisplayName"',
+             '--display-name "AlternateDisplayName" '
+             '--parent-group-id "/providers/Microsoft.Management/managementGroups/AlternateRootGroup"',
              checks=[])
 
 
@@ -195,6 +215,8 @@ def call_scenario(test):
     step__hierarchysettings_get_listgroupsettings(test)
     step__hierarchysettings_patch_getgroupsettings(test)
     step__managementgroupsubscriptions_put_addsubscriptiontomanagementgroup(test)
+    step__managementgroupsubscriptions_get_getallsubscriptionsfrommanagementgroup(test)
+    step__managementgroupsubscriptions_get_getsubscriptionfrommanagementgroup(test)
     step__managementgroups_put_putmanagementgroup(test)
     step__managementgroups_get_getdescendants(test)
     step__managementgroups_get_getmanagementgroup(test)

src/managementgroup/azext_managementgroup/vendored_sdks/managementgroup/_configuration.py

@@ -53,7 +53,7 @@ def __init__(
         self.skip = skip
         self.top = top
         self.skiptoken = skiptoken
-        self.api_version = "2020-02-01"
+        self.api_version = "2020-05-01"
         self.credential_scopes = ['https://management.azure.com/.default']
         self.credential_scopes.extend(kwargs.pop('credential_scopes', []))
         kwargs.setdefault('sdk_moniker', 'managementgroupsapi/{}'.format(VERSION))

src/managementgroup/azext_managementgroup/vendored_sdks/managementgroup/aio/_configuration_async.py

@@ -50,7 +50,7 @@ def __init__(
         self.skip = skip
         self.top = top
         self.skiptoken = skiptoken
-        self.api_version = "2020-02-01"
+        self.api_version = "2020-05-01"
         self.credential_scopes = ['https://management.azure.com/.default']
         self.credential_scopes.extend(kwargs.pop('credential_scopes', []))
         kwargs.setdefault('sdk_moniker', 'managementgroupsapi/{}'.format(VERSION))

src/managementgroup/azext_managementgroup/vendored_sdks/managementgroup/aio/operations_async/_entity_operations_async.py

@@ -95,7 +95,7 @@ def list(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.EntityListResult"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
 
         def prepare_request(next_link=None):
             if not next_link:

src/managementgroup/azext_managementgroup/vendored_sdks/managementgroup/aio/operations_async/_hierarchy_setting_operations_async.py

@@ -57,7 +57,7 @@ async def list(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.HierarchySettingsList"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
 
         # Construct URL
         url = self.list.metadata['url']  # type: ignore
@@ -109,7 +109,7 @@ async def get(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.HierarchySettings"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
 
         # Construct URL
         url = self.get.metadata['url']  # type: ignore
@@ -175,7 +175,7 @@ async def create_or_update(
         error_map.update(kwargs.pop('error_map', {}))
 
         _create_tenant_settings_request = models.CreateOrUpdateSettingsRequest(require_authorization_for_group_creation=require_authorization_for_group_creation, default_management_group=default_management_group)
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -247,7 +247,7 @@ async def update(
         error_map.update(kwargs.pop('error_map', {}))
 
         _create_tenant_settings_request = models.CreateOrUpdateSettingsRequest(require_authorization_for_group_creation=require_authorization_for_group_creation, default_management_group=default_management_group)
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -305,7 +305,7 @@ async def delete(
         cls = kwargs.pop('cls', None)  # type: ClsType[None]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
 
         # Construct URL
         url = self.delete.metadata['url']  # type: ignore

src/managementgroup/azext_managementgroup/vendored_sdks/managementgroup/aio/operations_async/_management_group_operations_async.py

@@ -60,7 +60,7 @@ def list(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ManagementGroupListResult"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
 
         def prepare_request(next_link=None):
             if not next_link:
@@ -144,7 +144,7 @@ async def get(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ManagementGroup"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
 
         # Construct URL
         url = self.get.metadata['url']  # type: ignore
@@ -201,7 +201,7 @@ async def _create_or_update_initial(
         error_map.update(kwargs.pop('error_map', {}))
 
         _create_management_group_request = models.CreateManagementGroupRequest(name=name, display_name_properties_display_name=display_name, id_properties_details_parent_id=id)
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -323,7 +323,7 @@ async def update(
         group_id: str,
         cache_control: Optional[str] = "no-cache",
         display_name: Optional[str] = None,
-        parent_id: Optional[str] = None,
+        parent_group_id: Optional[str] = None,
         **kwargs
     ) -> "models.ManagementGroup":
         """Update a management group.
@@ -334,9 +334,9 @@ async def update(
         :type cache_control: str
         :param display_name: The friendly name of the management group.
         :type display_name: str
-        :param parent_id: (Optional) The fully qualified ID for the parent management group.  For
+        :param parent_group_id: (Optional) The fully qualified ID for the parent management group.  For
          example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000.
-        :type parent_id: str
+        :type parent_group_id: str
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: ManagementGroup, or the result of cls(response)
         :rtype: ~management_groups_api.models.ManagementGroup
@@ -346,8 +346,8 @@ async def update(
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
 
-        _patch_group_request = models.PatchManagementGroupRequest(display_name=display_name, parent_id=parent_id)
-        api_version = "2020-02-01"
+        _patch_group_request = models.PatchManagementGroupRequest(display_name=display_name, parent_group_id=parent_group_id)
+        api_version = "2020-05-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -399,7 +399,7 @@ async def _delete_initial(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.AzureAsyncOperationResults"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
 
         # Construct URL
         url = self._delete_initial.metadata['url']  # type: ignore
@@ -513,7 +513,7 @@ def get_descendant(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.DescendantListResult"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-02-01"
+        api_version = "2020-05-01"
 
         def prepare_request(next_link=None):
             if not next_link: