archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for idempotent issue in cnos_vlan module and fixes for vlag/portchannel tests. (#22385)

Browse Source 
* misc fixes for idempotent issue in cnos_vlan

* Fix up hyperlinks in module documentation

* spell correction
pull/22419/head
Dave Kasberg 8 years ago committed by John R Barker
parent e24ddb4980
commit 8102e66425
20 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File

16
lib/ansible/module_utils/cnos.py
Unescape Escape View File

@ -2179,6 +2179,17 @@ def vlanAccessMapConfig(
# EOM # EOM
def checkVlanNameNotAssigned(
obj, deviceType, prompt, timeout, vlanId, vlanName):
retVal = "ok"
command = "display vlan id " + vlanId + " \n"
retVal = waitForDeviceResponse(command, prompt, timeout, obj)
if(retVal.find(vlanName) != -1):
return "Nok"
return retVal
# EOM
# Utility Method to create vlan # Utility Method to create vlan
def createVlan( def createVlan(
obj, deviceType, prompt, timeout, vlanArg1, vlanArg2, vlanArg3, obj, deviceType, prompt, timeout, vlanArg1, vlanArg2, vlanArg3,
@ -2193,8 +2204,13 @@ def createVlan(
# debugOutput("name") # debugOutput("name")
command = vlanArg2 + " " command = vlanArg2 + " "
value = checkSanityofVariable(deviceType, "vlan_name", vlanArg3) value = checkSanityofVariable(deviceType, "vlan_name", vlanArg3)
if(value == "ok"):
value = checkVlanNameNotAssigned(obj, deviceType, prompt, timeout,
vlanArg1, vlanArg3)
if(value == "ok"): if(value == "ok"):
command = command + vlanArg3 command = command + vlanArg3
else:
command = "\n"
else: else:
retVal = "Error-139" retVal = "Error-139"
return retVal return retVal

2
lib/ansible/modules/network/lenovo/cnos_backup.py
Unescape Escape View File

@ -43,7 +43,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_backup.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_backup.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

4
lib/ansible/modules/network/lenovo/cnos_bgp.py
Unescape Escape View File

@ -39,10 +39,10 @@ description:
bgpArg2, bgpArg3, bgpArg4, bgpArg5, bgpArg6, bgpArg7, and bgpArg8. For more details on bgpArg2, bgpArg3, bgpArg4, bgpArg5, bgpArg6, bgpArg7, and bgpArg8. For more details on
how to use these arguments, see [Overloaded Variables]. how to use these arguments, see [Overloaded Variables].
This module uses SSH to manage network device configuration. This module uses SSH to manage network device configuration.
TThe results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_bgp.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_bgp.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

2
lib/ansible/modules/network/lenovo/cnos_command.py
Unescape Escape View File

@ -40,7 +40,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_command.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_command.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

3
lib/ansible/modules/network/lenovo/cnos_conditional_command.py
Unescape Escape View File

@ -44,8 +44,7 @@ description:
more devices, it is recommended to use this module. more devices, it is recommended to use this module.
This module uses SSH to manage network device configuration. This module uses SSH to manage network device configuration.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide] use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_conditional_command.html)
http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_conditional_command.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

3
lib/ansible/modules/network/lenovo/cnos_conditional_template.py
Unescape Escape View File

@ -44,8 +44,7 @@ description:
template on one or more devices, it is recommended to use this module. template on one or more devices, it is recommended to use this module.
This module uses SSH to manage network device configuration. This module uses SSH to manage network device configuration.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide] use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_conditional_template.html)
(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_conditional_template.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

2
lib/ansible/modules/network/lenovo/cnos_factory.py
Unescape Escape View File

@ -37,7 +37,7 @@ description:
This module uses SSH to manage network device configuration. This module uses SSH to manage network device configuration.
The results of the operation can be viewed in results directory. The results of the operation can be viewed in results directory.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_factory.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_factory.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: {} options: {}

2
lib/ansible/modules/network/lenovo/cnos_facts.py
Unescape Escape View File

@ -35,7 +35,7 @@ description:
and returns a file containing all the system information of the target network device. This module uses SSH to and returns a file containing all the system information of the target network device. This module uses SSH to
manage network device configuration. The results of the operation can be viewed in results directory. manage network device configuration. The results of the operation can be viewed in results directory.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_facts.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_facts.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: {} options: {}

2
lib/ansible/modules/network/lenovo/cnos_image.py
Unescape Escape View File

@ -41,7 +41,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_image.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_image.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

2
lib/ansible/modules/network/lenovo/cnos_interface.py
Unescape Escape View File

@ -47,7 +47,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_interface.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_interface.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

2
lib/ansible/modules/network/lenovo/cnos_portchannel.py
Unescape Escape View File

@ -40,7 +40,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_portchannel.html) use cases, please U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_portchannel.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

2
lib/ansible/modules/network/lenovo/cnos_reload.py
Unescape Escape View File

@ -36,7 +36,7 @@ description:
This module uses SSH to manage network device configuration. This module uses SSH to manage network device configuration.
The results of the operation can be viewed in results directory. The results of the operation can be viewed in results directory.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_reload.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_reload.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: {} options: {}

2
lib/ansible/modules/network/lenovo/cnos_rollback.py
Unescape Escape View File

@ -43,7 +43,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_rollback.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_rollback.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

2
lib/ansible/modules/network/lenovo/cnos_save.py
Unescape Escape View File

@ -37,7 +37,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_save.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_save.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: {} options: {}

2
lib/ansible/modules/network/lenovo/cnos_showrun.py
Unescape Escape View File

@ -37,7 +37,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_showrun.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_showrun.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: {} options: {}

2
lib/ansible/modules/network/lenovo/cnos_template.py
Unescape Escape View File

@ -39,7 +39,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_template.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_template.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

2
lib/ansible/modules/network/lenovo/cnos_vlag.py
Unescape Escape View File

@ -42,7 +42,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_vlag.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_vlag.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:

4
lib/ansible/modules/network/lenovo/cnos_vlan.py
Unescape Escape View File

@ -45,7 +45,7 @@ description:
The results of the operation will be placed in a directory named 'results' The results of the operation will be placed in a directory named 'results'
that must be created by the user in their local directory to where the playbook is run. that must be created by the user in their local directory to where the playbook is run.
For more information about this module from Lenovo and customizing it usage for your For more information about this module from Lenovo and customizing it usage for your
use cases, please visit our [User Guide](http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_vlan.html) use cases, please visit U(http://systemx.lenovofiles.com/help/index.jsp?topic=%2Fcom.lenovo.switchmgt.ansible.doc%2Fcnos_vlan.html)
version_added: "2.3" version_added: "2.3"
extends_documentation_fragment: cnos extends_documentation_fragment: cnos
options: options:
@ -280,7 +280,7 @@ def main():
# need to add logic to check when changes occur or not # need to add logic to check when changes occur or not
errorMsg = cnos.checkOutputForError(output) errorMsg = cnos.checkOutputForError(output)
if(errorMsg is None): if(errorMsg is None):
module.exit_json(changed=True, msg="VLAN configuration isaccomplished") module.exit_json(changed=True, msg="VLAN configuration is accomplished")
else: else:
module.fail_json(msg=errorMsg) module.fail_json(msg=errorMsg)

2
test/integration/roles/cnos_portchannel/vars/main.yml
Unescape Escape View File

@ -26,7 +26,7 @@ test_portchannel_data12:
test_portchannel_data13: test_portchannel_data13:
- {interfaceRange: 33, interfaceArg1: "service-policy", interfaceArg2: "input", interfaceArg3: "Anil"} - {interfaceRange: 33, interfaceArg1: "service-policy", interfaceArg2: "input", interfaceArg3: "Anil"}
test_portchannel_data14: test_portchannel_data14:
- {interfaceRange: 33, interfaceArg1: "speed", interfaceArg2: "auto"} - {interfaceRange: 13, interfaceArg1: "speed", interfaceArg2: "auto"}
test_portchannel_data15: test_portchannel_data15:
- {interfaceRange: 33, interfaceArg1: "storm-control", interfaceArg2: "broadcast", interfaceArg3: 12.5 } - {interfaceRange: 33, interfaceArg1: "storm-control", interfaceArg2: "broadcast", interfaceArg3: 12.5 }
test_portchannel_data16: test_portchannel_data16:

2
test/integration/roles/cnos_vlag/vars/main.yml
Unescape Escape View File

@ -6,7 +6,7 @@ test_vlag_data2:
test_vlag_data3: test_vlag_data3:
- {vlagArg1: "config-consistency", vlagArg2: "strict"} - {vlagArg1: "config-consistency", vlagArg2: "strict"}
test_vlag_data4: test_vlag_data4:
- {vlagArg1: "isl", vlagArg2: 23} - {vlagArg1: "isl", vlagArg2: 33}
test_vlag_data5: test_vlag_data5:
- {vlagArg1: "mac-address-table"} - {vlagArg1: "mac-address-table"}
test_vlag_data6: test_vlag_data6:

Write Preview
Loading…
Cancel
Save