From 1e5b8b30280ba02136aface269518da44a37496f Mon Sep 17 00:00:00 2001 From: abirami-n Date: Fri, 15 Mar 2019 13:53:30 +0530 Subject: [PATCH] Fix_dellos6_minor_issues (#52981) * Fix_dellos6_minor_issues * Fix_changes --- lib/ansible/module_utils/network/dellos6/dellos6.py | 7 ++++--- lib/ansible/plugins/terminal/dellos6.py | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ansible/module_utils/network/dellos6/dellos6.py b/lib/ansible/module_utils/network/dellos6/dellos6.py index 07a4fc5e2e8..60d4db594fa 100644 --- a/lib/ansible/module_utils/network/dellos6/dellos6.py +++ b/lib/ansible/module_utils/network/dellos6/dellos6.py @@ -146,15 +146,16 @@ def get_sublevel_config(running_config, module): def os6_parse(lines, indent=None, comment_tokens=None): sublevel_cmds = [ - re.compile(r'^vlan.*$'), + re.compile(r'^vlan !(priority).*$'), re.compile(r'^stack.*$'), re.compile(r'^interface.*$'), re.compile(r'datacenter-bridging.*$'), re.compile(r'line (console|telnet|ssh).*$'), re.compile(r'ip ssh !(server).*$'), - re.compile(r'ip (dhcp|vrf).*$'), + re.compile(r'ip dhcp pool.*$'), + re.compile(r'ip vrf !(forwarding).*$'), re.compile(r'(ip|mac|management|arp) access-list.*$'), - re.compile(r'ipv6 (dhcp|router).*$'), + re.compile(r'ipv6 (dhcp pool|router).*$'), re.compile(r'mail-server.*$'), re.compile(r'vpc domain.*$'), re.compile(r'router.*$'), diff --git a/lib/ansible/plugins/terminal/dellos6.py b/lib/ansible/plugins/terminal/dellos6.py index 6211e058e41..842b0c936f2 100644 --- a/lib/ansible/plugins/terminal/dellos6.py +++ b/lib/ansible/plugins/terminal/dellos6.py @@ -40,13 +40,12 @@ class TerminalModule(TerminalBase): re.compile(br"% ?Bad secret"), re.compile(br"(\bInterface is part of a port-channel\b)"), re.compile(br"(\bThe maximum number of users have already been created\b)|(\bUse '-' for range\b)"), - re.compile(br"Error:(.+)\s(\S+)"), re.compile(br"(?:incomplete|ambiguous) command", re.I), re.compile(br"connection timed out", re.I), re.compile(br"'[^']' +returned error code: ?\d+"), re.compile(br"Invalid|invalid.*$", re.I), - re.compile(br"((\bout of range\b)|(\bnot found\b)|(\bCould not\b)|(\bUnable to\b)|(\bCannot\b)).*", re.I), - re.compile(br"((\balready exists\b)|(\bdoes not exist\b)|(\bnot active\b)|(\bFailed\b)|(\bIncorrect\b)|(\bnot enabled\b)).*", re.I), + re.compile(br"((\bout of range\b)|(\bnot found\b)|(\bCould not\b)|(\bUnable to\b)|(\bCannot\b)|(\bError\b)).*", re.I), + re.compile(br"((\balready exists\b)|(\bnot exist\b)|(\bnot active\b)|(\bFailed\b)|(\bIncorrect\b)|(\bnot enabled\b)).*", re.I), ]