Skip to content

[ARM] Bump version of azure-mgmt-managementgroups from 0.2.0 to 1.0.0 (Track 2 SDK) and add new sub commands for management-group #20942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 14 commits into from
Feb 22, 2022
Merged

[ARM] Bump version of azure-mgmt-managementgroups from 0.2.0 to 1.0.0 (Track 2 SDK) and add new sub commands for management-group #20942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3a1f85e
Updated version number for azure-mgmt-managementgroups sdk
git-thomasdolan Jan 10, 2022
3471e76
Updated exception handler file to resolve errors in pipeline
git-thomasdolan Jan 11, 2022
2f7690c
Re-ran some tests in live mode
git-thomasdolan Jan 12, 2022
f6bcc41
Modified the update method for managementgroups and re-ran tests in l…
git-thomasdolan Jan 12, 2022
734090e
Ran tests in latest and 2019_03_01 Profile
git-thomasdolan Jan 21, 2022
d20bc4e
Re-ran tests in live mode under test_resource
git-thomasdolan Jan 21, 2022
3d88232
Updated management-group so that it now passes the style and linter c…
git-thomasdolan Jan 22, 2022
cbd0c7e
Added new commands from the managementgroups api
git-thomasdolan Feb 2, 2022
257dd9b
Passed style check
git-thomasdolan Feb 2, 2022
d1d8282
Re-ran unit tests after update to PATCH in the MG codebase
git-thomasdolan Feb 9, 2022
4dd71fc
Re-ran tests in the 2019_03_01 profile
git-thomasdolan Feb 9, 2022
e48fcd1
Ran a test in policyinsights
git-thomasdolan Feb 9, 2022
6a4431b
Made changes based on the PR comments
git-thomasdolan Feb 10, 2022
49339b7
Merge branch 'dev' into dev
git-thomasdolan Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modified the update method for managementgroups and re-ran tests in l… 
…ive mode
  • Loading branch information
@git-thomasdolan
git-thomasdolan committed Jan 12, 2022
commit f6bcc41549853415f65f282f5e2f66d0b9667041
19 changes: 10 additions & 9 deletions src/azure-cli/azure/cli/command_modules/resource/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,15 +459,16 @@ def load_command_table(self, _):
g.custom_show_command('show', 'cli_managementgroups_group_show')
g.custom_command('create', 'cli_managementgroups_group_create')
g.custom_command('delete', 'cli_managementgroups_group_delete')
g.generic_update_command(
'update',
getter_name='cli_managementgroups_group_update_get',
getter_type=resource_managementgroups_update_type,
setter_name='cli_managementgroups_group_update_set',
setter_type=resource_managementgroups_update_type,
custom_func_name='cli_managementgroups_group_update_custom_func',
custom_func_type=resource_managementgroups_update_type,
exception_handler=managementgroups_exception_handler)
g.custom_command('update', 'cli_managementgroups_group_create')
#g.generic_update_command(
#'update',
#getter_name='cli_managementgroups_group_update_get',
#getter_type=resource_managementgroups_update_type,
#setter_name='cli_managementgroups_group_update_set',
#setter_type=resource_managementgroups_update_type,
#custom_func_name='cli_managementgroups_group_update_custom_func',
#custom_func_type=resource_managementgroups_update_type,
#exception_handler=managementgroups_exception_handler)

with self.command_group('account management-group subscription', resource_managementgroups_subscriptions_sdk, client_factory=cf_management_group_subscriptions) as g:
g.custom_command('add', 'cli_managementgroups_subscription_add')
Expand Down
6 changes: 3 additions & 3 deletions src/azure-cli/azure/cli/command_modules/resource/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2888,15 +2888,15 @@ def cli_managementgroups_group_update_custom_func(
instance,
display_name=None,
parent_id=None):
parent_id = _get_parent_id_from_parent(parent_id)
parent_group_id = _get_parent_id_from_parent(parent_id)
instance.display_name = display_name
instance.parent_id = parent_id
instance.parent_group_id = parent_group_id
return instance


def cli_managementgroups_group_update_get():
from azure.mgmt.managementgroups.models import PatchManagementGroupRequest
update_parameters = PatchManagementGroupRequest(display_name=None, parent_id=None)
update_parameters = PatchManagementGroupRequest(display_name=None, parent_group_id=None)
return update_parameters


Expand Down
483 changes: 322 additions & 161 deletions ...d_modules/resource/tests/latest/recordings/test_create_managementgroup_with_parentid.yaml
View file
Open in desktop

Large diffs are not rendered by default.

860 changes: 646 additions & 214 deletions ...mmand_modules/resource/tests/latest/recordings/test_show_managementgroup_with_expand.yaml
View file
Open in desktop

Large diffs are not rendered by default.

859 changes: 445 additions & 414 deletions ...s/resource/tests/latest/recordings/test_show_managementgroup_with_expand_and_recurse.yaml
View file
Open in desktop

Large diffs are not rendered by default.

330 changes: 217 additions & 113 deletions ...odules/resource/tests/latest/recordings/test_update_managementgroup_with_displayname.yaml
View file
Open in desktop

Large diffs are not rendered by default.

534 changes: 324 additions & 210 deletions ...ce/tests/latest/recordings/test_update_managementgroup_with_displayname_and_parentid.yaml
View file
Open in desktop

Large diffs are not rendered by default.

522 changes: 314 additions & 208 deletions ...d_modules/resource/tests/latest/recordings/test_update_managementgroup_with_parentid.yaml
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_managmentgroups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ def test_show_managementgroup_with_expand(self):
self.assertIsNotNone(managementgroup_get["tenantId"])
self.assertEqual(
managementgroup_get["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")
self.assertEqual(
managementgroup_get["children"][0]["id"],
"/providers/Microsoft.Management/managementGroups/testcligetgroup3")
self.assertEqual(
managementgroup_get["children"][0]["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")
self.assertEqual(
managementgroup_get["children"][0]["displayName"],
"testcligetgroup3")
Expand Down Expand Up @@ -133,13 +133,13 @@ def test_show_managementgroup_with_expand_and_recurse(self):
self.assertIsNotNone(managementgroup_get["tenantId"])
self.assertEqual(
managementgroup_get["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")
self.assertEqual(
managementgroup_get["children"][0]["id"],
"/providers/Microsoft.Management/managementGroups/testcligetgroup3")
self.assertEqual(
managementgroup_get["children"][0]["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")
self.assertEqual(
managementgroup_get["children"][0]["displayName"],
"testcligetgroup3")
Expand All @@ -151,7 +151,7 @@ def test_show_managementgroup_with_expand_and_recurse(self):
"/providers/Microsoft.Management/managementGroups/testcligetgroup4")
self.assertEqual(
managementgroup_get["children"][0]["children"][0]["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")
self.assertEqual(
managementgroup_get["children"][0]["children"][0]["displayName"],
"testcligetgroup4")
Expand Down Expand Up @@ -240,27 +240,27 @@ def test_create_managementgroup_with_parentid(self):
self.cmd('account management-group delete --name ' + parentName)

self.assertIsNotNone(managementgroup_create)
self.assertIsNotNone(managementgroup_create["properties"]["details"])
self.assertIsNotNone(managementgroup_create["details"])
self.assertEqual(
managementgroup_create["id"],
"/providers/Microsoft.Management/managementGroups/" + name)
self.assertEqual(managementgroup_create["name"], name)
self.assertEqual(
managementgroup_create["properties"]["displayName"],
managementgroup_create["displayName"],
displayName)
self.assertEqual(
managementgroup_create["properties"]["details"]["parent"]["displayName"],
managementgroup_create["details"]["parent"]["displayName"],
parentName)
self.assertEqual(
managementgroup_create["properties"]["details"]["parent"]["id"],
managementgroup_create["details"]["parent"]["id"],
parentId)
self.assertEqual(
managementgroup_create["properties"]["details"]["parent"]["name"],
managementgroup_create["details"]["parent"]["name"],
parentName)
self.assertIsNotNone(managementgroup_create["properties"]["tenantId"])
self.assertIsNotNone(managementgroup_create["tenantId"])
self.assertEqual(
managementgroup_create["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")

def test_create_managementgroup_with_displayname_and_parentid(self):
name = "testcligroupchild"
Expand Down Expand Up @@ -321,7 +321,7 @@ def test_update_managementgroup_with_displayname(self):
self.assertEqual(managementgroup_update["displayName"], displayName)
self.assertEqual(
managementgroup_update["details"]["parent"]["displayName"],
"Tenant Root Group")
"Root Management Group")
self.assertEqual(
managementgroup_update["details"]["parent"]["id"],
"/providers/Microsoft.Management/managementGroups/" +
Expand All @@ -332,7 +332,7 @@ def test_update_managementgroup_with_displayname(self):
self.assertIsNotNone(managementgroup_update["tenantId"])
self.assertEqual(
managementgroup_update["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")

def test_update_managementgroup_with_parentid(self):
name = "testcligroupchild"
Expand Down Expand Up @@ -369,7 +369,7 @@ def test_update_managementgroup_with_parentid(self):
self.assertIsNotNone(managementgroup_update["tenantId"])
self.assertEqual(
managementgroup_update["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")

def test_update_managementgroup_with_displayname_and_parentid(self):
name = "testcligroupchild"
Expand Down Expand Up @@ -407,7 +407,7 @@ def test_update_managementgroup_with_displayname_and_parentid(self):
self.assertIsNotNone(managementgroup_update["tenantId"])
self.assertEqual(
managementgroup_update["type"],
"/providers/Microsoft.Management/managementGroups")
"Microsoft.Management/managementGroups")

def test_create_delete_group_managementgroup(self):
self.cmd('account management-group create --name testcligroup')
Expand Down