Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

augmenting description for nxos_vlan description #29

Closed
wants to merge 2 commits into from
Closed

augmenting description for nxos_vlan description #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57e12bd
augmenting description for nxos_vlan description
jonasstenling Nov 16, 2015
a5d9581
removing results['msg'] and adding results['vlan_id']
jonasstenling Nov 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions library/nxos_vlan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@ options:
default: present
choices: ['present','absent']
aliases: []
mode:
description:
- Set VLAN mode to fabricpath or classical ethernet. The feature-set
fabricpath must be installed in the switch which requires the
ENHANCED_LAYER2_PKG license. Supported on Nexus 5500 with
NX-OS 5.1(3)N1(1) or later and on Nexus 7000 with NX-OS 5.1(1)
or later.
required: false
default: null
choices: ['ce', 'fabricpath']
aliases: []
host:
description:
- IP Address or hostname (resolvable by Ansible control host)
Expand Down Expand Up @@ -140,6 +151,7 @@ def main():
name=dict(default=None),
vlan_state=dict(choices=['active', 'suspend'], default='active'),
state=dict(choices=['present', 'absent'], default='present'),
mode=dict(choices=['ce', 'fabricpath'], default=None),
admin_state=dict(choices=['up', 'down'], default='up'),
protocol=dict(choices=['http', 'https'], default='http'),
host=dict(required=True),
Expand All @@ -160,13 +172,14 @@ def main():
vlan_state = module.params['vlan_state']
admin_state = module.params['admin_state']
state = module.params['state']
mode = module.params['mode']

device = Device(ip=host, username=username, password=password,
protocol=protocol)

changed = False
proposed = dict(vlan_id=vlan_id, name=name, vlan_state=vlan_state,
admin_state=admin_state)
admin_state=admin_state, mode=mode)

proposed_vlans_list = nxapi_lib.vlan_range_to_list(vlan_id)
proposed_vlans_list.sort()
Expand Down Expand Up @@ -222,6 +235,7 @@ def main():
proposed = dict(vlan_id=vlan,
vlan_state=vlan_state,
admin_state=admin_state,
mode=mode,
name=name)
delta = set(proposed.iteritems()).difference(existing.iteritems())
if delta:
Expand All @@ -239,7 +253,8 @@ def main():
final_existing[vlan] = existing
final_proposed[vlan] = dict(vlan_id=vlan,
vlan_state=vlan_state,
admin_state=admin_state)
admin_state=admin_state,
mode=mode)

if final_commands:
if module.check_mode:
Expand All @@ -258,6 +273,7 @@ def main():
results['state'] = state
results['commands'] = final_commands
results['changed'] = changed
results['vlan_id'] = vlan_id

module.exit_json(**results)

Expand Down