diff options
| author | Rohit Thakur <rohitthakur2590@outlook.com> | 2020-04-22 20:23:39 +0530 |
|---|---|---|
| committer | Rohit Thakur <rohitthakur2590@outlook.com> | 2020-04-22 20:23:39 +0530 |
| commit | 2f68e4bfd9b908e6dc36ce7ce04bfdc29dfb6264 (patch) | |
| tree | acc261df9f25ed470b05bf7a98227e69da22052e | |
| parent | e31d8fce791afe62d13f60056dd3f6aaa4a6f859 (diff) | |
| download | vyos.vyos-2f68e4bfd9b908e6dc36ce7ce04bfdc29dfb6264.tar.gz vyos.vyos-2f68e4bfd9b908e6dc36ce7ce04bfdc29dfb6264.zip | |
final code changes
Signed-off-by: Rohit Thakur <rohitthakur2590@outlook.com>
| -rw-r--r-- | plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py b/plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py index c980795a..9bb7c0af 100644 --- a/plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py +++ b/plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py @@ -51,20 +51,14 @@ class Ospfv3Facts(object): # typically data is populated from the current device configuration # data = connection.get('show running-config | section ^interface') # using mock data instead - objs = [] + objs = {} ospfv3 = findall(r"^set protocols ospfv3 (.+)", data, M) if ospfv3: - config = self.render_config(ospfv3) - if config: - objs.append(config) - ansible_facts["ansible_network_resources"].pop("ospfv3", None) + objs = self.render_config(ospfv3) facts = {} - if objs: - facts["ospfv3"] = [] - params = utils.validate_config(self.argument_spec, {"config": objs}) - for cfg in params["config"]: - facts["ospfv3"].append(utils.remove_empties(cfg)) - ansible_facts["ansible_network_resources"].update(facts) + params = utils.validate_config(self.argument_spec, {'config': objs}) + facts['ospfv3'] = utils.remove_empties(params['config']) + ansible_facts['ansible_network_resources'].update(facts) return ansible_facts def render_config(self, conf): @@ -92,9 +86,9 @@ class Ospfv3Facts(object): """ r_lst = [] if attrib == "area": - items = findall(r"^" + attrib + " (?:\'*)(\S+)(?:\'*)", conf, M) + items = findall(r"^" + attrib + " (?:\'*)(\\S+)(?:\'*)", conf, M) else: - items = findall(r"" + attrib + " (?:\'*)(\S+)(?:\'*)", conf, M) + items = findall(r"" + attrib + " (?:\'*)(\\S+)(?:\'*)", conf, M) if items: a_lst = [] for item in set(items): |