support application security group in network interface (#52450)

This commit is contained in:
Yunge Zhu 2019-02-21 17:23:09 +08:00 committed by Zim Kalinowski
parent aa2cf46a09
commit 55e9acb043
7 changed files with 219 additions and 96 deletions

View file

@ -158,6 +158,11 @@ options:
- Whether the ip configuration is the primary one in the list.
type: bool
default: 'no'
application_security_groups:
description:
- List of application security groups in which the IP configuration is included.
- Element of the list could be a resource id of application security group, or dict of C(resource_group) and C(name).
version_added: 2.8
version_added: 2.5
enable_accelerated_networking:
description:
@ -355,13 +360,13 @@ state:
'''
try:
from msrestazure.tools import parse_resource_id, resource_id
from msrestazure.tools import parse_resource_id, resource_id, is_valid_resource_id
from msrestazure.azure_exceptions import CloudError
except ImportError:
# This is handled in azure_rm_common
pass
from ansible.module_utils.azure_rm_common import AzureRMModuleBase, azure_id_to_dict, normalize_location_name
from ansible.module_utils.azure_rm_common import AzureRMModuleBase, azure_id_to_dict, normalize_location_name, format_resource_id
from ansible.module_utils._text import to_native
@ -389,7 +394,9 @@ def nic_to_dict(nic):
id=config.public_ip_address.id,
name=azure_id_to_dict(config.public_ip_address.id).get('publicIPAddresses'),
public_ip_allocation_method=config.public_ip_address.public_ip_allocation_method
) if config.public_ip_address else None
) if config.public_ip_address else None,
application_security_groups=([asg.id for asg in config.application_security_groups]
if config.application_security_groups else None)
) for config in nic.ip_configurations
]
return dict(
@ -426,7 +433,8 @@ ip_configuration_spec = dict(
public_ip_address_name=dict(type='str', aliases=['public_ip_address', 'public_ip_name']),
public_ip_allocation_method=dict(type='str', choices=['Dynamic', 'Static'], default='Dynamic'),
load_balancer_backend_address_pools=dict(type='list'),
primary=dict(type='bool', default=False)
primary=dict(type='bool', default=False),
application_security_groups=dict(type='list', elements='raw')
)
@ -512,6 +520,25 @@ class AzureRMNetworkInterface(AzureRMModuleBase):
# if not set the security group name, use nic name for default
self.security_group = self.parse_resource_to_dict(self.security_group or self.name)
# if application security groups set, convert to resource id format
if self.ip_configurations:
for config in self.ip_configurations:
if config.get('application_security_groups'):
asgs = []
for asg in config['application_security_groups']:
asg_resource_id = asg
if isinstance(asg, str) and (not is_valid_resource_id(asg)):
asg = self.parse_resource_to_dict(asg)
if isinstance(asg, dict):
asg_resource_id = format_resource_id(val=asg['name'],
subscription_id=self.subscription_id,
namespace='Microsoft.Network',
types='applicationSecurityGroups',
resource_group=asg['resource_group'])
asgs.append(asg_resource_id)
if len(asgs) > 0:
config['application_security_groups'] = asgs
if self.state == 'present' and not self.ip_configurations:
# construct the ip_configurations array for compatible
self.deprecate('Setting ip_configuration flatten is deprecated and will be removed.'
@ -631,7 +658,10 @@ class AzureRMNetworkInterface(AzureRMModuleBase):
load_balancer_backend_address_pools=([self.network_models.BackendAddressPool(id=self.backend_addr_pool_id(bap_id))
for bap_id in ip_config.get('load_balancer_backend_address_pools')]
if ip_config.get('load_balancer_backend_address_pools') else None),
primary=ip_config.get('primary')
primary=ip_config.get('primary'),
application_security_groups=([self.network_models.ApplicationSecurityGroup(id=asg_id)
for asg_id in ip_config.get('application_security_groups')]
if ip_config.get('application_security_groups') else None)
) for ip_config in self.ip_configurations
]
@ -736,6 +766,8 @@ class AzureRMNetworkInterface(AzureRMModuleBase):
load_balancer_backend_address_pools=(set([to_native(self.backend_addr_pool_id(id))
for id in item.get('load_balancer_backend_address_pools')])
if item.get('load_balancer_backend_address_pools') else None),
application_security_groups=(set([to_native(asg_id) for asg_id in item.get('application_security_groups')])
if item.get('application_security_groups') else None),
name=to_native(item.get('name'))
)) for item in raw]
return set(configurations)