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

Fix network modules for ziploader changes #15311

Merged
merged 1 commit into from
Apr 6, 2016
Merged

Fix network modules for ziploader changes #15311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/ansible/module_utils/eos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,16 +194,15 @@ def config(self):
return self._config

def _load_params(self):
params = super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict()
super(NetworkModule, self)._load_params()
provider = self.params.get('provider') or dict()
for key, value in provider.items():
if key in NET_COMMON_ARGS:
if params.get(key) is None and value is not None:
params[key] = value
if self.params.get(key) is None and value is not None:
self.params[key] = value
for key, env_var in NET_ENV_ARGS.items():
if params.get(key) is None and env_var in os.environ:
params[key] = os.environ[env_var]
return params
if self.params.get(key) is None and env_var in os.environ:
self.params[key] = os.environ[env_var]

def connect(self):
try:
Expand Down
8 changes: 4 additions & 4 deletions lib/ansible/module_utils/ios.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ def config(self):
return self._config

def _load_params(self):
params = super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict()
super(NetworkModule, self)._load_params()
provider = self.params.get('provider') or dict()
for key, value in provider.items():
if key in NET_COMMON_ARGS.keys():
params[key] = value
return params
if self.params.get(key) is None and value is not None:
self.params[key] = value

def connect(self):
try:
Expand Down
8 changes: 4 additions & 4 deletions lib/ansible/module_utils/iosxr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ def config(self):
return self._config

def _load_params(self):
params = super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict()
super(NetworkModule, self)._load_params()
provider = self.params.get('provider') or dict()
for key, value in provider.items():
if key in NET_COMMON_ARGS.keys():
params[key] = value
return params
if self.params.get(key) is None and value is not None:
self.params[key] = value

def connect(self):
try:
Expand Down
8 changes: 4 additions & 4 deletions lib/ansible/module_utils/junos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ def config(self):
return self._config

def _load_params(self):
params = super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict()
super(NetworkModule, self)._load_params()
provider = self.params.get('provider') or dict()
for key, value in provider.items():
if key in NET_COMMON_ARGS.keys():
params[key] = value
return params
if self.params.get(key) is None and value is not None:
self.params[key] = value

def connect(self):
self.connection = Cli(self)
Expand Down
9 changes: 4 additions & 5 deletions lib/ansible/module_utils/nxos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,12 @@ def config(self):
return self._config

def _load_params(self):
params = super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict()
super(NetworkModule, self)._load_params()
provider = self.params.get('provider') or dict()
for key, value in provider.items():
if key in NET_COMMON_ARGS.keys():
if not params.get(key) and value is not None:
params[key] = value
return params
if self.params.get(key) is None and value is not None:
self.params[key] = value

def connect(self):
if self.params['transport'] == 'nxapi':
Expand Down
8 changes: 4 additions & 4 deletions lib/ansible/module_utils/openswitch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@ def config(self):
return self._config

def _load_params(self):
params = super(NetworkModule, self)._load_params()
provider = params.get('provider') or dict()
super(NetworkModule, self)._load_params()
provider = self.params.get('provider') or dict()
for key, value in provider.items():
if key in NET_COMMON_ARGS.keys():
params[key] = value
return params
if self.params.get(key) is None and value is not None:
self.params[key] = value

def connect(self):
if self.params['transport'] == 'rest':
Expand Down