ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-23 19:01:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix network modules for ziploader changes

Browse source
This commit is contained in:
Nathaniel Case 2016-04-06 14:54:47 -04:00 • committed by Toshio Kuratomi
parent 54a3a14428
commit 77e3dc9e6a
6 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/module_utils/eos.py
View file

@ -194,16 +194,15 @@ class NetworkModule(AnsibleModule):
return self._config return self._config
def _load_params(self): def _load_params(self):
params = super(NetworkModule, self)._load_params() super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict() provider = self.params.get('provider') or dict()
for key, value in provider.items(): for key, value in provider.items():
if key in NET_COMMON_ARGS: if key in NET_COMMON_ARGS:
if params.get(key) is None and value is not None: if self.params.get(key) is None and value is not None:
params[key] = value self.params[key] = value
for key, env_var in NET_ENV_ARGS.items(): for key, env_var in NET_ENV_ARGS.items():
if params.get(key) is None and env_var in os.environ: if self.params.get(key) is None and env_var in os.environ:
params[key] = os.environ[env_var] self.params[key] = os.environ[env_var]
return params
def connect(self): def connect(self):
try: try:

8
lib/ansible/module_utils/ios.py
View file

@ -109,12 +109,12 @@ class NetworkModule(AnsibleModule):
return self._config return self._config
def _load_params(self): def _load_params(self):
params = super(NetworkModule, self)._load_params() super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict() provider = self.params.get('provider') or dict()
for key, value in provider.items(): for key, value in provider.items():
if key in NET_COMMON_ARGS.keys(): if key in NET_COMMON_ARGS.keys():
params[key] = value if self.params.get(key) is None and value is not None:
return params self.params[key] = value
def connect(self): def connect(self):
try: try:

8
lib/ansible/module_utils/iosxr.py
View file

@ -99,12 +99,12 @@ class NetworkModule(AnsibleModule):
return self._config return self._config
def _load_params(self): def _load_params(self):
params = super(NetworkModule, self)._load_params() super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict() provider = self.params.get('provider') or dict()
for key, value in provider.items(): for key, value in provider.items():
if key in NET_COMMON_ARGS.keys(): if key in NET_COMMON_ARGS.keys():
params[key] = value if self.params.get(key) is None and value is not None:
return params self.params[key] = value
def connect(self): def connect(self):
try: try:

8
lib/ansible/module_utils/junos.py
View file

@ -76,12 +76,12 @@ class NetworkModule(AnsibleModule):
return self._config return self._config
def _load_params(self): def _load_params(self):
params = super(NetworkModule, self)._load_params() super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict() provider = self.params.get('provider') or dict()
for key, value in provider.items(): for key, value in provider.items():
if key in NET_COMMON_ARGS.keys(): if key in NET_COMMON_ARGS.keys():
params[key] = value if self.params.get(key) is None and value is not None:
return params self.params[key] = value
def connect(self): def connect(self):
self.connection = Cli(self) self.connection = Cli(self)

9
lib/ansible/module_utils/nxos.py
View file

@ -197,13 +197,12 @@ class NetworkModule(AnsibleModule):
return self._config return self._config
def _load_params(self): def _load_params(self):
params = super(NetworkModule, self)._load_params() super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict() provider = self.params.get('provider') or dict()
for key, value in provider.items(): for key, value in provider.items():
if key in NET_COMMON_ARGS.keys(): if key in NET_COMMON_ARGS.keys():
if not params.get(key) and value is not None: if self.params.get(key) is None and value is not None:
params[key] = value self.params[key] = value
return params
def connect(self): def connect(self):
if self.params['transport'] == 'nxapi': if self.params['transport'] == 'nxapi':

8
lib/ansible/module_utils/openswitch.py
View file

@ -176,12 +176,12 @@ class NetworkModule(AnsibleModule):
return self._config return self._config
def _load_params(self): def _load_params(self):
params = super(NetworkModule, self)._load_params() super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict() provider = self.params.get('provider') or dict()
for key, value in provider.items(): for key, value in provider.items():
if key in NET_COMMON_ARGS.keys(): if key in NET_COMMON_ARGS.keys():
params[key] = value if self.params.get(key) is None and value is not None:
return params self.params[key] = value
def connect(self): def connect(self):
if self.params['transport'] == 'rest': if self.params['transport'] == 'rest':