cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vyos interfacefix and test cases (#57169)

Browse source 
Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>
This commit is contained in:
Rohit 2019-05-31 16:13:40 +05:30 committed by GitHub
parent 223f509ea3
commit ae033f1ec3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/network/vyos/vyos_interface.py
View file

@ -204,6 +204,8 @@ def map_obj_to_commands(updates):
value = w.get(item) value = w.get(item)
if value and value != obj_in_have.get(item): if value and value != obj_in_have.get(item):
if item == 'description':
value = "\'" + str(value) + "\'"
commands.append(set_interface + ' ' + item + ' ' + str(value)) commands.append(set_interface + ' ' + item + ' ' + str(value))
if disable and not obj_in_have.get('disable', False): if disable and not obj_in_have.get('disable', False):
@ -215,6 +217,8 @@ def map_obj_to_commands(updates):
for item in params: for item in params:
value = w.get(item) value = w.get(item)
if value: if value:
if item == 'description':
value = "\'" + str(value) + "\'"
commands.append(set_interface + ' ' + item + ' ' + str(value)) commands.append(set_interface + ' ' + item + ' ' + str(value))
if disable: if disable:
@ -244,7 +248,7 @@ def map_config_to_obj(module):
if match: if match:
param = match.group(1) param = match.group(1)
if param == 'description': if param == 'description':
match = re.search(r'description (\S+)', line, re.M) match = re.search(r'description (.+)', line, re.M)
description = match.group(1).strip("'") description = match.group(1).strip("'")
interface['description'] = description interface['description'] = description
elif param == 'speed': elif param == 'speed':

10
test/integration/targets/vyos_interface/tests/cli/basic.yaml
View file

@ -23,7 +23,7 @@
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"set interfaces ethernet eth1" in result.commands' - '"set interfaces ethernet eth1" in result.commands'
- '"set interfaces ethernet eth1 description test-interface" in result.commands' - '"set interfaces ethernet eth1 description ''test-interface''" in result.commands'
- name: Configure interface params - name: Configure interface params
vyos_interface: vyos_interface:
@ -39,7 +39,7 @@
- assert: - assert:
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"set interfaces ethernet eth1 description test-interface-1" in result.commands' - '"set interfaces ethernet eth1 description ''test-interface-1''" in result.commands'
- '"set interfaces ethernet eth1 speed 100" in result.commands' - '"set interfaces ethernet eth1 speed 100" in result.commands'
- '"set interfaces ethernet eth1 duplex half" in result.commands' - '"set interfaces ethernet eth1 duplex half" in result.commands'
- '"set interfaces ethernet eth1 mtu 256" in result.commands' - '"set interfaces ethernet eth1 mtu 256" in result.commands'
@ -75,7 +75,7 @@
- assert: - assert:
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"set interfaces ethernet eth1 description test-interface-2" in result.commands' - '"set interfaces ethernet eth1 description ''test-interface-2''" in result.commands'
- '"set interfaces ethernet eth1 speed 1000" in result.commands' - '"set interfaces ethernet eth1 speed 1000" in result.commands'
- '"set interfaces ethernet eth1 duplex full" in result.commands' - '"set interfaces ethernet eth1 duplex full" in result.commands'
- '"set interfaces ethernet eth1 mtu 512" in result.commands' - '"set interfaces ethernet eth1 mtu 512" in result.commands'
@ -141,11 +141,11 @@
- assert: - assert:
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"set interfaces ethernet eth1 description test-interface-1" in result.commands' - '"set interfaces ethernet eth1 description ''test-interface-1''" in result.commands'
- '"set interfaces ethernet eth1 speed 100" in result.commands' - '"set interfaces ethernet eth1 speed 100" in result.commands'
- '"set interfaces ethernet eth1 duplex half" in result.commands' - '"set interfaces ethernet eth1 duplex half" in result.commands'
- '"set interfaces ethernet eth1 mtu 512" in result.commands' - '"set interfaces ethernet eth1 mtu 512" in result.commands'
- '"set interfaces ethernet eth2 description test-interface-2" in result.commands' - '"set interfaces ethernet eth2 description ''test-interface-2''" in result.commands'
- '"set interfaces ethernet eth2 speed 1000" in result.commands' - '"set interfaces ethernet eth2 speed 1000" in result.commands'
- '"set interfaces ethernet eth2 duplex full" in result.commands' - '"set interfaces ethernet eth2 duplex full" in result.commands'
- '"set interfaces ethernet eth2 mtu 256" in result.commands' - '"set interfaces ethernet eth2 mtu 256" in result.commands'

4
test/integration/targets/vyos_interface/tests/cli/net_interface.yaml
View file

@ -26,7 +26,7 @@
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"set interfaces ethernet eth1" in result.commands' - '"set interfaces ethernet eth1" in result.commands'
- '"set interfaces ethernet eth1 description test-interface" in result.commands' - '"set interfaces ethernet eth1 description ''test-interface''" in result.commands'
- name: Configure interface params using platform agnostic module - name: Configure interface params using platform agnostic module
net_interface: net_interface:
@ -42,7 +42,7 @@
- assert: - assert:
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"set interfaces ethernet eth1 description test-interface-1" in result.commands' - '"set interfaces ethernet eth1 description ''test-interface-1''" in result.commands'
- '"set interfaces ethernet eth1 speed 100" in result.commands' - '"set interfaces ethernet eth1 speed 100" in result.commands'
- '"set interfaces ethernet eth1 duplex half" in result.commands' - '"set interfaces ethernet eth1 duplex half" in result.commands'
- '"set interfaces ethernet eth1 mtu 256" in result.commands' - '"set interfaces ethernet eth1 mtu 256" in result.commands'