From 3f9e457751341f7a06bb83a659cae088400a05cc Mon Sep 17 00:00:00 2001
From: Denis GERMAIN
Date: Fri, 27 Jul 2018 08:56:36 +0200
Subject: [PATCH] feat: Add a enable_accelerated_networking flag in module +
tests; fixes #41218 (#42109)
---
.../cloud/azure/azure_rm_networkinterface.py | 24 ++++++++++
.../azure_rm_networkinterface/tasks/main.yml | 47 +++++++++++++++++++
2 files changed, 71 insertions(+)
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py
index af1d1ee664..fc66972974 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py
@@ -158,6 +158,12 @@ options:
type: bool
default: 'no'
version_added: 2.5
+ enable_accelerated_networking:
+ description:
+ - Specifies whether the network interface should be created with the accelerated networking feature or not
+ type: bool
+ version_added: 2.7
+ default: False
create_with_security_group:
description:
- Specifies whether a default security group should be be created with the NIC. Only applies when creating a new NIC.
@@ -257,6 +263,14 @@ EXAMPLES = '''
- name: backendaddrpool1
load_balancer: loadbalancer001
+ - name: Create a network interface in accelerated networking mode
+ azure_rm_networkinterface:
+ name: nic005
+ resource_group: Testing
+ virtual_network_name: vnet001
+ subnet_name: subnet001
+ enable_accelerated_networking: True
+
- name: Delete network interface
azure_rm_networkinterface:
resource_group: Testing
@@ -364,6 +378,7 @@ def nic_to_dict(nic):
enable_ip_forwarding=nic.enable_ip_forwarding,
provisioning_state=nic.provisioning_state,
etag=nic.etag,
+ enable_accelerated_networking=nic.enable_accelerated_networking,
)
@@ -386,6 +401,7 @@ class AzureRMNetworkInterface(AzureRMModuleBase):
resource_group=dict(type='str', required=True),
name=dict(type='str', required=True),
location=dict(type='str'),
+ enable_accelerated_networking=dict(type='bool', default=False),
create_with_security_group=dict(type='bool', default=True),
security_group=dict(type='raw', aliases=['security_group_name']),
state=dict(default='present', choices=['present', 'absent']),
@@ -409,6 +425,7 @@ class AzureRMNetworkInterface(AzureRMModuleBase):
self.name = None
self.location = None
self.create_with_security_group = None
+ self.enable_accelerated_networking = None
self.security_group = None
self.private_ip_address = None
self.private_ip_allocation_method = None
@@ -489,6 +506,12 @@ class AzureRMNetworkInterface(AzureRMModuleBase):
self.log("CHANGED: add or remove network interface {0} network security group".format(self.name))
changed = True
+ if self.enable_accelerated_networking != bool(results.get('enable_accelerated_networking')):
+ self.log("CHANGED: Accelerated Networking set to {0} (previously {1})".format(
+ self.enable_accelerated_networking,
+ results.get('enable_accelerated_networking')))
+ changed = True
+
if not changed:
nsg = self.get_security_group(self.security_group['resource_group'], self.security_group['name'])
if nsg and results.get('network_security_group') and results['network_security_group'].get('id') != nsg.id:
@@ -567,6 +590,7 @@ class AzureRMNetworkInterface(AzureRMModuleBase):
location=self.location,
tags=self.tags,
ip_configurations=nic_ip_configurations,
+ enable_accelerated_networking=self.enable_accelerated_networking,
network_security_group=nsg
)
self.results['state'] = self.create_or_update_nic(nic)
diff --git a/test/integration/targets/azure_rm_networkinterface/tasks/main.yml b/test/integration/targets/azure_rm_networkinterface/tasks/main.yml
index 491f72482e..899cf1c48b 100644
--- a/test/integration/targets/azure_rm_networkinterface/tasks/main.yml
+++ b/test/integration/targets/azure_rm_networkinterface/tasks/main.yml
@@ -252,6 +252,53 @@
- output.state.ip_configurations[0].public_ip_address == None
- output.state.network_security_group == None
+- name: NIC with Accelerated networking enabled
+ azure_rm_networkinterface:
+ resource_group: "{{ resource_group }}"
+ name: "tn{{ rpfx }}an"
+ virtual_network: "{{ vn.state.id }}"
+ subnet: "tn{{ rpfx }}"
+ enable_accelerated_networking: True
+ register: output
+
+- assert:
+ that:
+ - output.state.enable_accelerated_networking
+ - output.changed
+
+- name: NIC with Accelerated networking enabled (check idempotent)
+ azure_rm_networkinterface:
+ resource_group: "{{ resource_group }}"
+ name: "tn{{ rpfx }}an"
+ virtual_network: "{{ vn.state.id }}"
+ subnet: "tn{{ rpfx }}"
+ enable_accelerated_networking: True
+ register: output
+
+- assert:
+ that:
+ - output.state.enable_accelerated_networking
+ - not output.changed
+
+- name: Disable (previously enabled) Accelerated networking
+ azure_rm_networkinterface:
+ resource_group: "{{ resource_group }}"
+ name: "tn{{ rpfx }}an"
+ virtual_network: "{{ vn.state.id }}"
+ subnet: "tn{{ rpfx }}"
+ enable_accelerated_networking: False
+ register: output
+
+- assert:
+ that:
+ - not output.state.enable_accelerated_networking
+
+- name: Delete AN NIC
+ azure_rm_networkinterface:
+ resource_group: "{{ resource_group }}"
+ name: "tn{{ rpfx }}an"
+ state: absent
+
- name: Delete the NIC (check mode)
azure_rm_networkinterface:
resource_group: "{{ resource_group }}"