mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-25 03:41:25 -07:00
Add aggregate for junos modules and sub spec validation (#27726)
* Add aggregate for junos modules and sub spec validation * aggregate support of junos modules * aggregate sub spec validation * relevant changes to junos integration test * junos module boilerplate changes * Add new boilerplate for junos modules * Fix CI issues
This commit is contained in:
Ganesh Nalawade
GitHub
parent
6d59ac1bb4
commit
d3e5d30f7c
32 changed files with 1696 additions and 508 deletions
|
|
@ -2,22 +2,11 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# (c) 2017, Ansible by Red Hat, inc
|
||||
#
|
||||
# This file is part of Ansible by Red Hat
|
||||
#
|
||||
# Ansible is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Ansible is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
|
||||
from __future__ import absolute_import, division, print_function
|
||||
__metaclass__ = type
|
||||
|
||||
|
||||
ANSIBLE_METADATA = {'metadata_version': '1.0',
|
||||
'status': ['preview'],
|
||||
|
|
@ -65,7 +54,7 @@ options:
|
|||
description: List of Interfaces definitions.
|
||||
purge:
|
||||
description:
|
||||
- Purge Interfaces not defined in the aggregates parameter.
|
||||
- Purge Interfaces not defined in the aggregate parameter.
|
||||
This applies only for logical interface.
|
||||
default: no
|
||||
state:
|
||||
|
|
@ -126,6 +115,18 @@ EXAMPLES = """
|
|||
speed: 1g
|
||||
mtu: 256
|
||||
duplex: full
|
||||
|
||||
- name: Create interface using aggregate
|
||||
junos_interface:
|
||||
aggregate:
|
||||
- { name: ge-0/0/1, description: test-interface-1, speed: 1g, duplex: half, mtu: 512}
|
||||
- { name: ge-0/0/2, description: test-interface-2, speed: 10m, duplex: full, mtu: 256}
|
||||
|
||||
- name: Delete interface using aggregate
|
||||
junos_interface:
|
||||
aggregate:
|
||||
- { name: ge-0/0/1, description: test-interface-1, state: absent}
|
||||
- { name: ge-0/0/2, description: test-interface-2, state: absent}
|
||||
"""
|
||||
|
||||
RETURN = """
|
||||
|
|
@ -141,10 +142,12 @@ diff.prepared:
|
|||
"""
|
||||
import collections
|
||||
|
||||
from copy import copy
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.junos import junos_argument_spec, check_args
|
||||
from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele
|
||||
from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config
|
||||
from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config, to_param_list
|
||||
|
||||
try:
|
||||
from lxml.etree import tostring
|
||||
|
|
@ -159,19 +162,21 @@ def validate_mtu(value, module):
|
|||
module.fail_json(msg='mtu must be between 256 and 9192')
|
||||
|
||||
|
||||
def validate_param_values(module, obj):
|
||||
def validate_param_values(module, obj, param=None):
|
||||
if not param:
|
||||
param = module.params
|
||||
for key in obj:
|
||||
# validate the param value (if validator func exists)
|
||||
validator = globals().get('validate_%s' % key)
|
||||
if callable(validator):
|
||||
validator(module.params.get(key), module)
|
||||
validator(param.get(key), module)
|
||||
|
||||
|
||||
def main():
|
||||
""" main entry point for module execution
|
||||
"""
|
||||
argument_spec = dict(
|
||||
name=dict(required=True),
|
||||
element_spec = dict(
|
||||
name=dict(),
|
||||
description=dict(),
|
||||
enabled=dict(),
|
||||
speed=dict(),
|
||||
|
|
@ -179,16 +184,30 @@ def main():
|
|||
duplex=dict(choices=['full', 'half', 'auto']),
|
||||
tx_rate=dict(),
|
||||
rx_rate=dict(),
|
||||
aggregate=dict(),
|
||||
purge=dict(default=False, type='bool'),
|
||||
state=dict(default='present',
|
||||
choices=['present', 'absent', 'up', 'down']),
|
||||
active=dict(default=True, type='bool')
|
||||
)
|
||||
|
||||
aggregate_spec = copy(element_spec)
|
||||
aggregate_spec['name'] = dict(required=True)
|
||||
|
||||
argument_spec = dict(
|
||||
aggregate=dict(type='list', elements='dict', options=aggregate_spec),
|
||||
purge=dict(default=False, type='bool')
|
||||
)
|
||||
|
||||
argument_spec.update(element_spec)
|
||||
argument_spec.update(junos_argument_spec)
|
||||
|
||||
required_one_of = [['name', 'aggregate']]
|
||||
mutually_exclusive = [['name', 'aggregate'],
|
||||
['state', 'aggregate'],
|
||||
['active', 'aggregate']]
|
||||
|
||||
module = AnsibleModule(argument_spec=argument_spec,
|
||||
required_one_of=required_one_of,
|
||||
mutually_exclusive=mutually_exclusive,
|
||||
supports_check_mode=True)
|
||||
|
||||
warnings = list()
|
||||
|
|
@ -211,26 +230,33 @@ def main():
|
|||
('disable', {'xpath': 'disable', 'tag_only': True})
|
||||
])
|
||||
|
||||
state = module.params.get('state')
|
||||
module.params['disable'] = True if state == 'down' else False
|
||||
|
||||
if state in ('present', 'up', 'down'):
|
||||
module.params['state'] = 'present'
|
||||
else:
|
||||
module.params['disable'] = True
|
||||
|
||||
choice_to_value_map = {
|
||||
'link-mode': {'full': 'full-duplex', 'half': 'half-duplex', 'auto': 'automatic'}
|
||||
}
|
||||
|
||||
validate_param_values(module, param_to_xpath_map)
|
||||
params = to_param_list(module)
|
||||
|
||||
want = map_params_to_obj(module, param_to_xpath_map)
|
||||
ele = map_obj_to_ele(module, want, top, choice_to_value_map)
|
||||
requests = list()
|
||||
for param in params:
|
||||
item = copy(param)
|
||||
state = item.get('state')
|
||||
item['disable'] = True if state == 'down' else False
|
||||
|
||||
if state in ('present', 'up', 'down'):
|
||||
item['state'] = 'present'
|
||||
else:
|
||||
item['disable'] = True
|
||||
|
||||
validate_param_values(module, param_to_xpath_map, param=item)
|
||||
want = map_params_to_obj(module, param_to_xpath_map, param=item)
|
||||
requests.append(map_obj_to_ele(module, want, top, value_map=choice_to_value_map, param=item))
|
||||
|
||||
diff = None
|
||||
with locked_config(module):
|
||||
diff = load_config(module, tostring(ele), warnings, action='replace')
|
||||
for req in requests:
|
||||
diff = load_config(module, tostring(req), warnings, action='replace')
|
||||
|
||||
# issue commit after last configuration change is done
|
||||
commit = not module.check_mode
|
||||
if diff:
|
||||
if commit:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue