ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix for special case of last element of url (#43354)

Browse source 
* fix for special case of last element of url

* improved version

* fixed mistake

* adding appropriate test

* fix problem

* just fixed task name
This commit is contained in:
Zim Kalinowski 2018-07-31 16:31:08 +08:00 • committed by GitHub
parent c344a94846
commit c8fcbdef71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/modules/cloud/azure/azure_rm_resource.py
View file

@ -210,6 +210,7 @@ class AzureRMResource(AzureRMModuleBase):
self.status_code.append(204)
if self.url is None:
orphan = None
rargs = dict()
rargs['subscription'] = self.subscription_id
rargs['resource_group'] = self.resource_group
@ -217,16 +218,27 @@ class AzureRMResource(AzureRMModuleBase):
rargs['namespace'] = "Microsoft." + self.provider
else:
rargs['namespace'] = self.provider
rargs['type'] = self.resource_type
rargs['name'] = self.resource_name
for i in range(len(self.subresource)):
rargs['child_namespace_' + str(i + 1)] = self.subresource[i].get('namespace', None)
rargs['child_type_' + str(i + 1)] = self.subresource[i].get('type', None)
rargs['child_name_' + str(i + 1)] = self.subresource[i].get('name', None)
if self.resource_type is not None and self.resource_name is not None:
rargs['type'] = self.resource_type
rargs['name'] = self.resource_name
for i in range(len(self.subresource)):
resource_ns = self.subresource[i].get('namespace', None)
resource_type = self.subresource[i].get('type', None)
resource_name = self.subresource[i].get('name', None)
if resource_type is not None and resource_name is not None:
rargs['child_namespace_' + str(i + 1)] = resource_ns
rargs['child_type_' + str(i + 1)] = resource_type
rargs['child_name_' + str(i + 1)] = resource_name
else:
orphan = resource_type
else:
orphan = self.resource_type
self.url = resource_id(**rargs)
if orphan is not None:
self.url += '/' + orphan
query_parameters = {}
query_parameters['api-version'] = self.api_version