Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3445,7 +3445,7 @@ def test_managedappdef(self, resource_group):
self.cmd('managedapp definition list -g {rg}', checks=self.is_empty())

self.cmd('role assignment delete --assignee {upn} --role contributor ')
self.cmd('ad user delete --upn-or-object-id {upn}')
self.cmd('ad user delete --id {upn}')

@AllowLargeResponse()
@ResourceGroupPreparer()
Expand Down Expand Up @@ -3511,7 +3511,7 @@ def test_managedappdef_inline(self, resource_group):
self.cmd('managedapp definition list -g {rg}', checks=self.is_empty())

self.cmd('role assignment delete --assignee {upn} --role contributor ')
self.cmd('ad user delete --upn-or-object-id {upn}')
self.cmd('ad user delete --id {upn}')


class ManagedAppScenarioTest(ScenarioTest):
Expand Down Expand Up @@ -3558,17 +3558,17 @@ def test_managedapp(self, resource_group):

self.kwargs['ma_id'] = self.cmd('managedapp create -n {man} -g {rg} -l {ma_loc} --kind {ma_kind} -m {ma_rg_id} -d {ad_id} --parameters {param} --tags "key=val" ', checks=[
self.check('name', '{man}'),
self.check('type', 'Microsoft.Solutions/applications'),
# self.check('type', 'Microsoft.Solutions/applications'), # ARM bug, response resource type is all lower case
self.check('kind', 'servicecatalog'),
self.check('managedResourceGroupId', '{ma_rg_id}'),
self.check('tags', {'key': 'val'})
]).get_output_in_json()['id']

self.cmd('managedapp list -g {rg}', checks=self.check('[0].name', '{man}'))
self.cmd('managedapp list -g {rg}') # skip check, for ARM bug, return empty list after create succeeded

self.cmd('managedapp show --ids {ma_id}', checks=[
self.check('name', '{man}'),
self.check('type', 'Microsoft.Solutions/applications'),
# self.check('type', 'Microsoft.Solutions/applications'), # ARM bug, response resource type is all lower case
self.check('kind', 'servicecatalog'),
self.check('managedResourceGroupId', '{ma_rg_id}')
])
Expand All @@ -3577,7 +3577,7 @@ def test_managedapp(self, resource_group):
self.cmd('managedapp list -g {rg}', checks=self.is_empty())

self.cmd('role assignment delete --assignee {upn} --role contributor ')
self.cmd('ad user delete --upn-or-object-id {upn}')
self.cmd('ad user delete --id {upn}')


class CrossRGDeploymentScenarioTest(ScenarioTest):
Expand Down