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

Update some cliconf plugins #47141

Merged
merged 3 commits into from Oct 18, 2018
Merged

Update some cliconf plugins #47141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7816a54
Update some cliconf plugins
Qalthos Oct 16, 2018
b88d9e4
Add `check_all` to many more cliconf plugins
Qalthos Oct 17, 2018
7af136b
Add nos
Qalthos Oct 18, 2018
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
6 changes: 3 additions & 3 deletions lib/ansible/plugins/cliconf/aireos.py
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@

from itertools import chain

from ansible.module_utils._text import to_bytes, to_text
from ansible.module_utils._text import to_text
from ansible.module_utils.network.common.utils import to_list
from ansible.plugins.cliconf import CliconfBase, enable_mode

Expand Down Expand Up @@ -69,8 +69,8 @@ def edit_config(self, command):
for cmd in chain([b'config'], to_list(command), [b'end']):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/aruba.py
View file
Open in desktop
Expand Up @@ -70,8 +70,8 @@ def edit_config(self, command):
for cmd in chain([b'configure terminal'], to_list(command), [b'end']):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/asa.py
View file
Open in desktop
Expand Up @@ -67,8 +67,8 @@ def edit_config(self, command):
for cmd in chain([b'configure terminal'], to_list(command), [b'end']):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/ce.py
View file
Open in desktop
Expand Up @@ -82,8 +82,8 @@ def edit_config(self, command):
results.append(self.send_command(command, prompt, answer, False, newline))
return results[1:-1]

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/plugins/cliconf/cnos.py
View file
Open in desktop
Expand Up @@ -81,7 +81,7 @@ def edit_config(self, command):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/dellos10.py
View file
Open in desktop
Expand Up @@ -71,8 +71,8 @@ def edit_config(self, command):
for cmd in chain(['configure terminal'], to_list(command), ['end']):
self.send_command(to_bytes(cmd))

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/dellos6.py
View file
Open in desktop
Expand Up @@ -71,8 +71,8 @@ def edit_config(self, command):
for cmd in chain([b'configure terminal'], to_list(command), [b'end']):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/dellos9.py
View file
Open in desktop
Expand Up @@ -71,8 +71,8 @@ def edit_config(self, command):
for cmd in chain([b'configure terminal'], to_list(command), [b'end']):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/edgeos.py
View file
Open in desktop
Expand Up @@ -45,8 +45,8 @@ def edit_config(self, candidate=None, commit=True, replace=False, comment=None):
for cmd in chain(['configure'], to_list(candidate)):
self.send_command(cmd)

def get(self, command=None, prompt=None, answer=None, sendonly=False, output=None):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def commit(self, comment=None):
if comment:
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/enos.py
View file
Open in desktop
Expand Up @@ -67,8 +67,8 @@ def edit_config(self, command):
for cmd in chain([b'configure terminal'], to_list(command), [b'end']):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/exos.py
View file
Open in desktop
Expand Up @@ -87,8 +87,8 @@ def edit_config(self, command):
self.send_command(to_bytes(command), to_bytes(prompt), to_bytes(answer),
False, newline)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_device_operations(self):
return {
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/ironware.py
View file
Open in desktop
Expand Up @@ -70,8 +70,8 @@ def edit_config(self, command):
for cmd in chain([b'configure terminal'], to_list(command), [b'end']):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/nos.py
View file
Open in desktop
Expand Up @@ -95,8 +95,8 @@ def edit_config(self, command):
resp['response'] = results
return resp

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/onyx.py
View file
Open in desktop
Expand Up @@ -59,8 +59,8 @@ def edit_config(self, command):
for cmd in chain([b'configure terminal'], to_list(command), [b'exit']):
self.send_command(cmd)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/routeros.py
View file
Open in desktop
Expand Up @@ -67,8 +67,8 @@ def get_config(self, source='running', format='text', flags=None):
def edit_config(self, command):
return

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/plugins/cliconf/slxos.py
View file
Open in desktop
Expand Up @@ -87,8 +87,8 @@ def edit_config(self, command):

self.send_command(command, prompt, answer, False, newline)

def get(self, command, prompt=None, answer=None, sendonly=False):
return self.send_command(command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_capabilities(self):
result = {}
Expand Down
9 changes: 2 additions & 7 deletions lib/ansible/plugins/cliconf/voss.py
View file
Open in desktop
Expand Up @@ -142,13 +142,8 @@ def edit_config(self, candidate=None, commit=True, replace=None, comment=None):
resp['response'] = results
return resp

def get(self, command=None, prompt=None, answer=None, sendonly=False, output=None):
if not command:
raise ValueError('must provide value of command to execute')
if output:
raise ValueError("'output' value %s is not supported for get" % output)

return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly)
def get(self, command, prompt=None, answer=None, sendonly=False, check_all=False):
return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, check_all=check_all)

def get_device_info(self):
device_info = {}
Expand Down