Skip to content

Commit

Permalink
Support to create secondary IP for NIC using azure_rm_networkinterface (
Browse files Browse the repository at this point in the history 
ansible-collections#1686)

* Support to create secondary IP for NIC using azure_rm_networkinterface

* small change

* the private_ip_address does not retrun

* small change

* Small change for nic

* small change

* modify the document

* small change 02
  • Loading branch information
@Fred-sun @Justwmz
Fred-sun authored and Justwmz committed Nov 4, 2024
1 parent 734caad commit 4300ae2
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 18 deletions.
46 changes: 32 additions & 14 deletions plugins/modules/azure_rm_networkinterface.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@
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 I(resource_group) and I(name).
- Element of the list could be a resource id of application security group, or the name of the application
security group located in the current resource group, or a dictionary with resource groups and names.
type: list
elements: raw
enable_accelerated_networking:
Expand Down Expand Up @@ -633,23 +634,28 @@ def exec_module(self, **kwargs):
self.security_group = self.parse_resource_to_dict(self.security_group or self.name)

# if application security groups set, convert to resource id format
primary_flag = False
if self.ip_configurations:
primary_flag = False
for config in self.ip_configurations:
if config.get('primary'):
primary_flag = True
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'])
if isinstance(asg, str):
if is_valid_resource_id(asg):
asg = self.parse_resource_to_dict(asg)
else:
asg = dict(name=asg)
else:
if asg.get('name') is None:
self.fail("If the element of application_security_groups is a dictionary, you must define 'name'.")
asg_resource_id = format_resource_id(val=asg['name'],
subscription_id=self.subscription_id,
namespace='Microsoft.Network',
types='applicationSecurityGroups',
resource_group=asg.get('resource_group', self.resource_group))
asgs.append(asg_resource_id)
if len(asgs) > 0:
config['application_security_groups'] = asgs
Expand Down Expand Up @@ -735,8 +741,20 @@ def exec_module(self, **kwargs):
# name, private_ip_address, public_ip_address_name, private_ip_allocation_method, subnet_name
ip_configuration_result = self.construct_ip_configuration_set(results['ip_configurations'])
ip_configuration_request = self.construct_ip_configuration_set(self.ip_configurations)
if not skip_compare and not self.default_compare({}, ip_configuration_request, ip_configuration_result, '', dict(compare=[])):
changed = True
if skip_compare:
self.ip_configurations = results['ip_configurations']
else:
if not primary_flag:
self.ip_configurations[0]['primary'] = False
if not self.default_compare({}, ip_configuration_request, ip_configuration_result, '', dict(compare=[])):
changed = True
ip_configuration_request_name = [item['name'] for item in ip_configuration_request]
for item_result in results['ip_configurations']:
if item_result['name'] not in ip_configuration_request_name:
if primary_flag and item_result.get('primary'):
self.fail("Both the service and playbook ip configuration have primary keys. Please confirm which primary key is used")
self.ip_configurations.append(item_result)

elif self.state == 'absent':
self.log("CHANGED: network interface {0} exists but requested state is 'absent'".format(self.name))
changed = True
Expand Down Expand Up @@ -903,9 +921,9 @@ def construct_ip_configuration_set(self, raw):
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')),
private_ip_address=to_native(item.get('private_ip_address')),
private_ip_address_version=to_native(item.get('private_ip_address_version')),
public_ip_allocation_method=to_native(item.get('public_ip_allocation_method', 'Dynamic'))
public_ip_allocation_method=to_native(item.get('public_ip_allocation_method', 'Dynamic')),
primary=bool(item.get('primary'))
) for item in raw]
return configurations

Expand Down
18 changes: 14 additions & 4 deletions tests/integration/targets/azure_rm_networkinterface/tasks/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
- facts.networkinterfaces[0].ip_configurations[0].primary == True
- facts.networkinterfaces[0].ip_configurations[1].primary == False

- name: Remove one dns server and ip configuration
- name: Remove one dns server
azure_rm_networkinterface:
resource_group: "{{ resource_group }}"
name: "tn{{ rpfx }}"
Expand All @@ -359,9 +359,21 @@
dns_servers:
- 8.9.10.11
ip_configurations:
- name: "{{ facts.networkinterfaces[0].ip_configurations[0].name }}"
private_ip_address: "{{ facts.networkinterfaces[0].ip_configurations[0].private_ip_address }}"
private_ip_allocation_method: "{{ facts.networkinterfaces[0].ip_configurations[0].private_ip_allocation_method }}"
primary: "{{ facts.networkinterfaces[0].ip_configurations[0].primary }}"
- name: ipconfig2
private_ip_address: "{{ output.state.ip_configurations[1].private_ip_address }}"
public_ip_name: "tn{{ rpfx }}v6"
private_ip_address_version: 'IPv6'
load_balancer_backend_address_pools:
- "{{ lb.state.backend_address_pools[2].id }}"
- name: backendaddrpool2
load_balancer: "lb{{ rpfx }}"
- name: ipconfig1
public_ip_name: "tn{{ rpfx }}"
primary: true
private_ip_address: "{{ output.state.ip_configurations[2].private_ip_address }}"
load_balancer_backend_address_pools:
- "{{ lb.state.backend_address_pools[0].id }}"
- name: backendaddrpool1
Expand All @@ -375,8 +387,6 @@
- output.state.dns_settings.dns_servers == ['8.9.10.11']
- output.state.enable_ip_forwarding
- output.state.network_security_group.name == "tn{{ rpfx }}sg"
- "output.state.ip_configurations | length == 1"
- output.state.ip_configurations[0].public_ip_address.name == "tn{{ rpfx }}"
- output.state.enable_accelerated_networking

- name: Create application security group(check mode)
Expand Down

0 comments on commit 4300ae2

Please sign in to comment.