Fix misuse of 'self' in lib/ansible/module_utils/network/eos/eos.py. …

[eakman]

Fixes #27630

SUMMARY

There seems to be a slight error in ansible/lib/ansible/module_utils/network/eos/eos.py in the method load_config.

As you can see from the snippet below in the old code, when configure is called (an instance method of CLI), self is given as an argument. This is causing an error (see issue number #27630) because configure only takes two arguments. This commit removes self from the arguments of load_config.

Old code:

def load_config(self, commands, commit=False, replace=False):
        ...
        if not all((bool(use_session), self.supports_sessions)):
            if commit:
                return self.configure(self, commands)
            else:
                self._module.warn("EOS can not check config without config session")
                result = {'changed': True}
                return result
        ....

New code:

def load_config(self, commands, commit=False, replace=False):
        ...
        if not all((bool(use_session), self.supports_sessions)):
            if commit:
                return self.configure(commands)
            else:
                self._module.warn("EOS can not check config without config session")
                result = {'changed': True}
                return result
        ....

ISSUE TYPE

• Bugfix Pull Request

COMPONENT NAME

ansible/lib/ansible/module_utils/network/eos/eos.py

ANSIBLE VERSION

ansible 2.4.2.0
  config file = /Users/xbbnllu/.ansible.cfg
  configured module search path = [u'/Users/xbbnllu/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
  ansible python module location = /Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ansible
  executable location = ./bin/ansible
  python version = 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 12:39:47) [GCC 4.2.1 (Apple Inc. build 5666) (dot 3)]

ADDITIONAL INFORMATION

[bugfix/misuse_of_self_in_eos_module_util 2a22085b2b] Fix misuse of 'self' in lib/ansible/module_utils/network/eos/eos.py. Method load_config
 1 file changed, 1 insertion(+), 1 deletion(-)

[ansibot]

cc @Qalthos @ganeshrn @gdpak @gundalow @privateip @rcarrillocruz @trishnaguha
click here for bot help

[trishnaguha]

There is another place where this function is called. Would you mind fixing that also? https://github.com/eakman/ansible/blob/2a22085b2b4af6aa9de4b82311e9586d75611bb9/lib/ansible/module_utils/network/eos/eos.py#L423
Thanks.

[eakman]

Ok, I'll take a look!

[eakman]

Ok, I made the requested changes.

[trishnaguha]

cherry-picked to 2.5