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

Jump to bottom

Fixes#27314 - Handled issue in parsing "exit" in dellos6 running config #28060

Merged
merged 1 commit into from
Sep 12, 2017
Merged

Fixes#27314 - Handled issue in parsing "exit" in dellos6 running config #28060

merged 1 commit into from
Sep 12, 2017

Conversation

abirami-n
Copy link
Contributor

SUMMARY

Included changes to handle "exit" in dellos6 running-config.
Fixes #27314

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

ansible.module_utils.dellos6

ANSIBLE VERSION
ansible 2.4.0  (devel b4b3ca9d64) 
config file = /etc/ansible/ansible.cfg 
configured module search path = [u'/root/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
ADDITIONAL INFORMATION

Included change in plugin file of dellos6.py to support in devel.

@abirami-n
Copy link
Contributor Author

The module_utils changes has to be back-ported to 2.3 and 2.2.

@ansibot ansibot added affects_2.4 This issue/PR affects Ansible v2.4 bugfix_pull_request c:module_utils/ c:plugins/terminal needs_triage Needs a first human triage before being processed. networking Network category support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Aug 11, 2017
@abirami-n abirami-n mentioned this pull request Aug 11, 2017
Closed
@s-hertel s-hertel removed the needs_triage Needs a first human triage before being processed. label Aug 11, 2017
@ansibot
Copy link
Contributor

ansibot commented Aug 19, 2017

cc @skg-net
click here for bot help

@ansibot ansibot added the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Aug 19, 2017
@gundalow
Copy link
Contributor

@skg-net Could you please review this.

This will be for devel and stable-2.3.

stable-2.2 will only get critical security bug fixes.

@gundalow gundalow added the backport This PR does not target the devel branch. label Aug 25, 2017
@gundalow gundalow added this to the 2.4.0 milestone Aug 25, 2017
@calfonso calfonso added the waiting_on_maintainer This issue/PR requires input from the maintainer(s). label Aug 28, 2017
@abirami-n abirami-n mentioned this pull request Sep 8, 2017
Closed
@gundalow
Copy link
Contributor

rebuild_merge

@gundalow
Copy link
Contributor

Given that we are close to 2.4, this is for devel and stable-2.4 only

@ansibot ansibot removed the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Sep 12, 2017
@gundalow gundalow merged commit adc5338 into ansible:devel Sep 12, 2017
abadger
abadger reviewed Sep 12, 2017
View reviewed changes
lib/ansible/plugins/terminal/dellos6.py
@@ -48,7 +48,7 @@ def on_authorize(self, passwd=None):

cmd = {u'command': u'enable'}
if passwd:
cmd[u'prompt'] = to_text(r"[\r\n]?password: $", errors='surrogate_or_strict')
cmd[u'prompt'] = to_text(r"[\r\n]?password:$", errors='surrogate_or_strict')
Copy link
Contributor

Choose a reason for hiding this comment

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

Prexisting but note that you're still operating on a string literal here so you can write it like this:

cmd[u'promt'] = ur"[\r\n]?password:$"

Copy link
Contributor

Choose a reason for hiding this comment

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

string literals are quicker than calling to_text() so that's why I mention it.

abadger pushed a commit that referenced this pull request Sep 12, 2017
@abirami-n @abadger
module_utils_fix_dellos6 (#28060)
3483040 
(cherry picked from commit adc5338)
@abadger
Copy link
Contributor

abadger commented Sep 12, 2017

cherry-picked to stable-2.4 for the 2.4.0rc3 release.

@skg-net
Copy link
Contributor

skg-net commented Sep 13, 2017

Thanks @abadger

prasadkatti pushed a commit to prasadkatti/ansible that referenced this pull request Oct 1, 2017
@abirami-n
module_utils_fix_dellos6 (ansible#28060)
f771e09
BondAnthony pushed a commit to BondAnthony/ansible that referenced this pull request Oct 5, 2017
@abirami-n @BondAnthony
module_utils_fix_dellos6 (ansible#28060)
29c1771
@ansibot ansibot added bug This issue/PR relates to a bug. and removed bugfix_pull_request labels Mar 6, 2018
@ansible ansible locked and limited conversation to collaborators Apr 26, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@abadger abadger abadger left review comments

@skg-net skg-net skg-net approved these changes

Assignees

@gundalow gundalow

Labels
affects_2.4 This issue/PR affects Ansible v2.4 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. c:module_utils/ c:plugins/terminal module_utils/ networking Network category plugins/terminal support:core This issue/PR relates to code supported by the Ansible Engineering Team. waiting_on_maintainer This issue/PR requires input from the maintainer(s).
Projects
None yet
Milestone
2.4.0
Development

Successfully merging this pull request may close these issues.

Issue in handling of "exit" in parsing dellos6 running config
7 participants
@abirami-n @ansibot @gundalow @abadger @skg-net @calfonso @s-hertel