Merge pull request #79 from dbarrosop/master
Timeout, documentation revamp and IBMDriver (beta)
This commit is contained in:
commit
6cebc70bdc
3 files changed
+11
-4
No files matched your search
@@ -50,6 +50,10 @@ options:
|
||||
password:
|
||||
description: Password
|
||||
required: true
|
||||
timeout:
|
||||
description: Timeout for connections and requests to device
|
||||
required: false
|
||||
default: 60
|
||||
config_file:
|
||||
description: Where to load the configuration from.
|
||||
required: true
|
||||
@@ -90,6 +94,7 @@ EXAMPLES = '''
|
||||
commit_changes={{ commit_changes }}
|
||||
replace_config={{ replace_config }}
|
||||
diff_file=../compiled/{{ inventory_hostname }}/diff
|
||||
timeout={{timeout}}
|
||||
|
||||
From the CLI we would trigger the playbook like:
|
||||
|
||||
@@ -114,6 +119,7 @@ def main():
|
||||
hostname=dict(required=True),
|
||||
username=dict(required=True),
|
||||
password=dict(required=True),
|
||||
timeout=dict(required=False, default=60, type='int'),
|
||||
config_file=dict(required=True),
|
||||
dev_os=dict(required=True),
|
||||
commit_changes=dict(required=True),
|
||||
@@ -128,6 +134,7 @@ def main():
|
||||
username = module.params['username']
|
||||
dev_os = module.params['dev_os']
|
||||
password = module.params['password']
|
||||
timeout = module.params['timeout']
|
||||
|
||||
config_file = module.params['config_file']
|
||||
commit_changes = module.params['commit_changes']
|
||||
@@ -142,7 +149,7 @@ def main():
|
||||
|
||||
network_driver = get_network_driver(dev_os)
|
||||
|
||||
device = network_driver(hostname, username, password)
|
||||
device = network_driver(hostname, username, password, timeout)
|
||||
device.open()
|
||||
|
||||
if replace_config:
|
||||
|
||||
+2
-2
@@ -37,11 +37,11 @@ def execute_get(device, cmd, separator=':', auto=False):
|
||||
|
||||
class FortiOSDriver(NetworkDriver):
|
||||
|
||||
def __init__(self, hostname, username, password):
|
||||
def __init__(self, hostname, username, password, timeout=60):
|
||||
self.hostname = hostname
|
||||
self.username = username
|
||||
self.password = password
|
||||
self.device = FortiOS(hostname, username=username, password=password)
|
||||
self.device = FortiOS(hostname, username=username, password=password, timeout=timeout)
|
||||
self.config_replace = False
|
||||
|
||||
def open(self):
|
||||
|
||||
@@ -27,5 +27,5 @@ class TestFortiOSDriver(unittest.TestCase, TestNetworkDriver):
|
||||
password = 'this_is_not_a_secure_password'
|
||||
cls.vendor = 'fortios'
|
||||
|
||||
cls.device = FortiOSDriver(hostname, username, password)
|
||||
cls.device = FortiOSDriver(hostname, username, password, timeout=60)
|
||||
cls.device.open()
|
||||
Reference in new issue
Block a user