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.

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

Added Exos vlan resource module #61865

Merged
merged 12 commits into from Oct 10, 2019
Empty file.
51 changes: 51 additions & 0 deletions lib/ansible/module_utils/network/exos/argspec/vlans/vlans.py
@@ -0,0 +1,51 @@
#
# -*- coding: utf-8 -*-
# Copyright 2019 Red Hat
# GNU General Public License v3.0+
# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

#############################################
# WARNING #
#############################################
#
# This file is auto generated by the resource
# module builder playbook.
#
# Do not edit this file manually.
#
# Changes to this file will be over written
# by the resource module builder.
#
# Changes should be made in the model used to
# generate this file or in the resource module
# builder template.
#
#############################################

"""
The arg spec for the exos_vlans module
"""


class VlansArgs(object): # pylint: disable=R0903
"""The arg spec for the exos_vlans module
"""

def __init__(self, **kwargs):
pass

argument_spec = {
'config': {
'elements': 'dict',
'options': {
'name': {'type': 'str'},
'state': {
'choices': ['active', 'suspended'],
'default': 'active',
'type': 'str'},
'vlan_id': {'required': True, 'type': 'int'}},
'type': 'list'},
'state': {
'choices': ['merged', 'replaced', 'overridden', 'deleted'],
'default': 'merged',
'type': 'str'}} # pylint: disable=C0301
Empty file.
269 changes: 269 additions & 0 deletions lib/ansible/module_utils/network/exos/config/vlans/vlans.py
@@ -0,0 +1,269 @@
#
# -*- coding: utf-8 -*-
# Copyright 2019 Red Hat
# GNU General Public License v3.0+
# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
"""
The exos_vlans class
It is in this file where the current configuration (as dict)
is compared to the provided configuration (as dict) and the command set
necessary to bring the current configuration to it's desired end-state is
created
"""

import json
from copy import deepcopy
from ansible.module_utils.network.common.cfg.base import ConfigBase
from ansible.module_utils.network.common.utils import to_list, dict_diff
from ansible.module_utils.network.exos.facts.facts import Facts
from ansible.module_utils.network.exos.exos import send_requests
from ansible.module_utils.network.exos.utils.utils import search_obj_in_list

class Vlans(ConfigBase):
"""
The exos_vlans class
"""

gather_subset = [
'!all',
'!min',
]

gather_network_resources = [
'vlans',
]

VLAN_POST = {
"data": {"openconfig-vlan:vlans": []},
"method": "POST",
"path": "/rest/restconf/data/openconfig-vlan:vlans/"
}

VLAN_PATCH = {
"data": {"openconfig-vlan:vlans":{"vlan": []}},
"method": "PATCH",
"path": "/rest/restconf/data/openconfig-vlan:vlans/"
}

VLAN_DELETE = {
"method": "DELETE",
"path": None
}

DEL_PATH = "/rest/restconf/data/openconfig-vlan:vlans/vlan="

REQUEST_BODY = {
"config": {"name": None , "status": "ACTIVE" , "tpid": "oc-vlan-types:TPID_0x8100", "vlan-id": None }
}

def __init__(self, module):
super(Vlans, self).__init__(module)

def get_vlans_facts(self):
""" Get the 'facts' (the current configuration)

:rtype: A dictionary
:returns: The current configuration as a dictionary
"""
facts, _warnings = Facts(self._module).get_facts(
self.gather_subset, self.gather_network_resources)
vlans_facts = facts['ansible_network_resources'].get('vlans')
if not vlans_facts:
return []
return vlans_facts

def execute_module(self):
""" Execute the module

:rtype: A dictionary
:returns: The result from module execution
"""
result = {'changed': False}
warnings = list()
requests = list()

existing_vlans_facts = self.get_vlans_facts()
requests.extend(self.set_config(existing_vlans_facts))
if requests:
if not self._module.check_mode:
send_requests(self._module, requests=requests)
result['changed'] = True
result['requests'] = requests

changed_vlans_facts = self.get_vlans_facts()

result['before'] = existing_vlans_facts
if result['changed']:
result['after'] = changed_vlans_facts

result['warnings'] = warnings
return result

def set_config(self, existing_vlans_facts):
""" Collect the configuration from the args passed to the module,
collect the current configuration (as a dict from facts)

:rtype: A list
:returns: the commands necessary to migrate the current configuration
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you could replace 'commands' with 'requests' in the comments that would be good.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the changes!
Looks good.

to the desired configuration
"""
want = self._module.params['config']
have = existing_vlans_facts
resp = self.set_state(want, have)
return to_list(resp)

def set_state(self, want, have):
""" Select the appropriate function based on the state provided

:param want: the desired configuration as a dictionary
:param have: the current configuration as a dictionary
:rtype: A list
:returns: the commands necessary to migrate the current configuration
to the desired configuration
"""
state = self._module.params['state']
if state == 'overridden':
requests = self._state_overridden(want, have)
elif state == 'deleted':
requests = self._state_deleted(want, have)
elif state == 'merged':
requests = self._state_merged(want, have)
elif state == 'replaced':
requests = self._state_replaced(want, have)
return requests

def _state_replaced(self, want, have):
""" The command generator when state is replaced

:rtype: A list
:returns: the commands necessary to migrate the current configuration
to the desired configuration
"""
requests = []

request_patch = deepcopy(self.VLAN_PATCH)
request_body = deepcopy(self.REQUEST_BODY)

for w in want:
if w.get('vlan_id'):
h = search_obj_in_list(w['vlan_id'], have, 'vlan_id')
if h:
if dict_diff(w, h):
request_body = deepcopy(self.REQUEST_BODY)
request_body = self._update_vlan_config_body(w, request_body)
request_patch["data"]["openconfig-vlan:vlans"]["vlan"].append(request_body)
else:
request_post = deepcopy(self.VLAN_POST)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have identical code on lines 159-163, 193-197, 228-232... Move it into a function.

request_body = self._update_vlan_config_body(w, request_body)
request_post["data"]["openconfig-vlan:vlans"].append(request_body)
request_post["data"] = json.dumps(request_post["data"])
requests.append(request_post)

if len(request_patch["data"]["openconfig-vlan:vlans"]["vlan"]):
request_patch["data"] = json.dumps(request_patch["data"])
requests.append(request_patch)

return requests

def _state_overridden(self, want, have):
""" The command generator when state is overridden

:rtype: A list
:returns: the commands necessary to migrate the current configuration
to the desired configuration
"""
requests = []

request_patch = deepcopy(self.VLAN_PATCH)
request_body = deepcopy(self.REQUEST_BODY)
have_copy = []
for w in want:
if w.get('vlan_id'):
h = search_obj_in_list(w['vlan_id'], have, 'vlan_id')
if h:
if dict_diff(w, h):
request_body = deepcopy(self.REQUEST_BODY)
request_body = self._update_vlan_config_body(w, request_body)
request_patch["data"]["openconfig-vlan:vlans"]["vlan"].append(request_body)
have_copy.append(h)
else:
request_post = deepcopy(self.VLAN_POST)
request_body = self._update_vlan_config_body(w, request_body)
request_post["data"]["openconfig-vlan:vlans"].append(request_body)
request_post["data"] = json.dumps(request_post["data"])
requests.append(request_post)

for h in have:
request_delete = deepcopy(self.VLAN_DELETE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deepcopy only if required, move it inside the conditional.

if h not in have_copy and h['vlan_id'] != 1:
request_delete["path"] = self.DEL_PATH + str(h['vlan_id'])
requests.append(request_delete)

if len(request_patch["data"]["openconfig-vlan:vlans"]["vlan"]):
request_patch["data"] = json.dumps(request_patch["data"])
requests.append(request_patch)

return requests

def _state_merged(self, want, have):
""" The command generator when state is merged

:rtype: A list
:returns: the commands necessary to merge the provided into
the current configuration
"""
requests = []

request_body = deepcopy(self.REQUEST_BODY)

for w in want:
if w.get('vlan_id'):
h = search_obj_in_list(w['vlan_id'], have, 'vlan_id')
if h:
continue
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the VLAN exists, you should check the name and state to make sure they are same as requested.

else:
request_post = deepcopy(self.VLAN_POST)
request_body = self._update_vlan_config_body(w, request_body)
request_post["data"]["openconfig-vlan:vlans"].append(request_body)
request_post["data"] = json.dumps(request_post["data"])
requests.append(request_post)

return requests

def _state_deleted(self, want, have):
""" The command generator when state is deleted

:rtype: A list
:returns: the commands necessary to remove the current configuration
of the provided objects
"""
requests = []

if want:
for w in want:
request_delete = deepcopy(self.VLAN_DELETE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this line after 250.
You won't need to deepcopy unless you are actually creating a request.

if w.get('vlan_id'):
h = search_obj_in_list(w['vlan_id'], have, 'vlan_id')
if h:
request_delete["path"] = self.DEL_PATH + str(h['vlan_id'])
requests.append(request_delete)

else:
if not have:
return requests
for h in have:
request_delete = deepcopy(self.VLAN_DELETE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this line after 261.
You won't need to deepcopy unless you are actually creating a request.

if h['vlan_id'] == 1:
continue
else:
request_delete["path"] = self.DEL_PATH + str(h['vlan_id'])
requests.append(request_delete)

return requests

def _update_vlan_config_body(self, want, request):
request["config"]["name"] = want["name"]
request["config"]["status"] = want["state"].upper()
request["config"]["vlan-id"] = want["vlan_id"]
return request

2 changes: 2 additions & 0 deletions lib/ansible/module_utils/network/exos/facts/facts.py
Expand Up @@ -14,6 +14,7 @@
from ansible.module_utils.network.exos.argspec.facts.facts import FactsArgs
from ansible.module_utils.network.common.facts.facts import FactsBase
from ansible.module_utils.network.exos.facts.lldp_global.lldp_global import Lldp_globalFacts
from ansible.module_utils.network.exos.facts.vlans.vlans import VlansFacts
from ansible.module_utils.network.exos.facts.legacy.base import Default, Hardware, Interfaces, Config

FACT_LEGACY_SUBSETS = dict(
Expand All @@ -24,6 +25,7 @@

FACT_RESOURCE_SUBSETS = dict(
lldp_global=Lldp_globalFacts,
vlans=VlansFacts,
)


Expand Down
Empty file.