Made private methods private
This commit is contained in:
1 parent
f1fa04bb9b
commit
8456b5271a
2 files changed
+28
-25
No files matched your search
+27
-24
@@ -47,7 +47,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
'is_alive': self.device.ssh.get_transport().is_active()
|
||||
}
|
||||
|
||||
def execute_command_with_vdom(self, command, vdom=None):
|
||||
def _execute_command_with_vdom(self, command, vdom=None):
|
||||
# If the user doesn't specify a particular vdom we use the default vdom for the object.
|
||||
vdom = vdom or self.vdom
|
||||
|
||||
@@ -70,8 +70,8 @@ class FortiOSDriver(NetworkDriver):
|
||||
# If there is no vdom we just execute the command
|
||||
return self.device.execute_command(command)
|
||||
|
||||
def get_command_with_vdom(self, cmd, separator=':', auto=False, vdom=None):
|
||||
output = self.execute_command_with_vdom(cmd, vdom)
|
||||
def _get_command_with_vdom(self, cmd, separator=':', auto=False, vdom=None):
|
||||
output = self._execute_command_with_vdom(cmd, vdom)
|
||||
|
||||
if auto:
|
||||
if ':' in output[0]:
|
||||
@@ -121,7 +121,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
|
||||
def commit_config(self):
|
||||
try:
|
||||
self.execute_command_with_vdom('execute backup config flash commit_with_napalm')
|
||||
self._execute_command_with_vdom('execute backup config flash commit_with_napalm')
|
||||
self.device.commit()
|
||||
self.discard_config()
|
||||
except FailedCommit as e:
|
||||
@@ -135,9 +135,9 @@ class FortiOSDriver(NetworkDriver):
|
||||
self.device.load_config(in_candidate=True)
|
||||
|
||||
def rollback(self):
|
||||
output = self.execute_command_with_vdom('fnsysctl ls -l data2/config', vdom=None)
|
||||
output = self._execute_command_with_vdom('fnsysctl ls -l data2/config', vdom=None)
|
||||
rollback_file = output[-2].split()[-1]
|
||||
rollback_config = self.execute_command_with_vdom(
|
||||
rollback_config = self._execute_command_with_vdom(
|
||||
'fnsysctl cat data2/config/{rollback_file}'.format(rollback_file))
|
||||
|
||||
self.device.load_config(empty_candidate=True)
|
||||
@@ -159,7 +159,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
get_candidate = retrieve == "all" or retrieve == "candidate"
|
||||
|
||||
if retrieve == "all" or get_running:
|
||||
result = self.execute_command_with_vdom('show')
|
||||
result = self._execute_command_with_vdom('show')
|
||||
text_result = '\n'.join(result)
|
||||
|
||||
return {
|
||||
@@ -176,14 +176,16 @@ class FortiOSDriver(NetworkDriver):
|
||||
}
|
||||
|
||||
def get_facts(self):
|
||||
system_status = self.get_command_with_vdom('get system status', vdom='global')
|
||||
performance_status = self.get_command_with_vdom('get system performance status',
|
||||
vdom='global')
|
||||
system_status = self._get_command_with_vdom('get system status', vdom='global')
|
||||
performance_status = self._get_command_with_vdom('get system performance status',
|
||||
vdom='global')
|
||||
|
||||
interfaces = self.execute_command_with_vdom('get system interface | grep ==', vdom='global')
|
||||
interfaces = self._execute_command_with_vdom('get system interface | grep ==',
|
||||
vdom='global')
|
||||
interface_list = [x.split()[2] for x in interfaces if x.strip() is not '']
|
||||
|
||||
domain = self.get_command_with_vdom('get system dns | grep domain', vdom='global')['domain']
|
||||
domain = self._get_command_with_vdom('get system dns | grep domain',
|
||||
vdom='global')['domain']
|
||||
|
||||
return {
|
||||
'vendor': unicode('Fortigate'),
|
||||
@@ -218,12 +220,13 @@ class FortiOSDriver(NetworkDriver):
|
||||
}
|
||||
|
||||
def get_interfaces(self):
|
||||
cmd_data = self.execute_command_with_vdom('diagnose hardware deviceinfo nic', vdom='global')
|
||||
cmd_data = self._execute_command_with_vdom('diagnose hardware deviceinfo nic',
|
||||
vdom='global')
|
||||
|
||||
interface_list = [x.replace('\t', '') for x in cmd_data if x.startswith('\t')]
|
||||
interface_statistics = {}
|
||||
for interface in interface_list:
|
||||
if_data = self.execute_command_with_vdom(
|
||||
if_data = self._execute_command_with_vdom(
|
||||
'diagnose hardware deviceinfo nic {}'.format(interface), vdom='global')
|
||||
parsed_data = {}
|
||||
if interface.startswith('mgmt'):
|
||||
@@ -262,7 +265,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
return l
|
||||
|
||||
def get_firewall_policies(self):
|
||||
cmd = self.execute_command_with_vdom('show firewall policy')
|
||||
cmd = self._execute_command_with_vdom('show firewall policy')
|
||||
policy = dict()
|
||||
policy_id = None
|
||||
default_policy = dict()
|
||||
@@ -315,7 +318,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
command_received = 'get router info bgp neighbors {} received-routes | grep prefixes '
|
||||
peers = dict()
|
||||
|
||||
bgp_sum = self.execute_command_with_vdom(command_sum)
|
||||
bgp_sum = self._execute_command_with_vdom(command_sum)
|
||||
|
||||
re_neigh = re.compile("^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
|
||||
neighbors = {n.split()[0]: n.split()[1:] for n in bgp_sum if re.match(re_neigh, n)}
|
||||
@@ -340,7 +343,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
neighbor_dict['address_family']['ipv6'] = dict()
|
||||
|
||||
detail_output = [x.lower() for x in
|
||||
self.execute_command_with_vdom(command_detail.format(neighbor))]
|
||||
self._execute_command_with_vdom(command_detail.format(neighbor))]
|
||||
m = re.search('remote router id (.+?)\n', '\n'.join(detail_output))
|
||||
if m:
|
||||
neighbor_dict['remote_id'] = unicode(m.group(1))
|
||||
@@ -357,7 +360,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
t = [int(s) for s in text.split() if s.isdigit()][0]
|
||||
neighbor_dict['address_family'][family][term] = t
|
||||
|
||||
received = self.execute_command_with_vdom(
|
||||
received = self._execute_command_with_vdom(
|
||||
command_received.format(neighbor))[0].split()
|
||||
if len(received) > 0:
|
||||
neighbor_dict['address_family'][family]['received_prefixes'] = received[-1]
|
||||
@@ -374,7 +377,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
}
|
||||
|
||||
def get_interfaces_counters(self):
|
||||
cmd = self.execute_command_with_vdom('fnsysctl ifconfig', vdom=None)
|
||||
cmd = self._execute_command_with_vdom('fnsysctl ifconfig', vdom=None)
|
||||
if_name = None
|
||||
interface_counters = dict()
|
||||
for line in cmd:
|
||||
@@ -471,7 +474,7 @@ class FortiOSDriver(NetworkDriver):
|
||||
out = dict()
|
||||
|
||||
sensors_block = [parse_string(x) for x in
|
||||
self.execute_command_with_vdom('execute sensor detail', vdom='global')
|
||||
self._execute_command_with_vdom('execute sensor detail', vdom='global')
|
||||
if x]
|
||||
|
||||
# temp
|
||||
@@ -485,14 +488,14 @@ class FortiOSDriver(NetworkDriver):
|
||||
# cpu
|
||||
out['cpu'] = get_cpu(
|
||||
[x for x in
|
||||
self.execute_command_with_vdom('get system performance status | grep CPU',
|
||||
vdom='global')[1:] if x])
|
||||
self._execute_command_with_vdom('get system performance status | grep CPU',
|
||||
vdom='global')[1:] if x])
|
||||
|
||||
# memory
|
||||
memory_command = 'diag hard sys mem | grep Mem:'
|
||||
t = [x for x in
|
||||
re.split('\s+', self.execute_command_with_vdom(memory_command,
|
||||
vdom='global')[0]) if x]
|
||||
re.split('\s+', self._execute_command_with_vdom(memory_command,
|
||||
vdom='global')[0]) if x]
|
||||
out['memory'] = get_memory(t)
|
||||
|
||||
# power, not implemented
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"included": [{"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_bgp_neighbors[normal]", "teardown": {"duration": 7.700920104980469e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003800392150878906, "outcome": "passed", "name": "setup"}, "run_index": 11, "call": {"duration": 0.004490852355957031, "outcome": "passed", "name": "call"}, "duration": 0.005327939987182617, "outcome": "passed"}, "type": "test", "id": 1}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_route_to[no_test_case_found]", "teardown": {"duration": 6.389617919921875e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003459453582763672, "outcome": "passed", "name": "setup"}, "run_index": 13, "call": {"duration": 0.00012302398681640625, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm/lib/python2.7/site-packages/napalm_base/test/getters.py', 78, u'Skipped: Method not implemented')"}, "duration": 0.0008788108825683594, "outcome": "skipped"}, "type": "test", "id": 2}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_arp_table[no_test_case_found]", "teardown": {"duration": 6.914138793945312e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.000370025634765625, "outcome": "passed", "name": "setup"}, "run_index": 1, "call": {"duration": 0.00012612342834472656, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm/lib/python2.7/site-packages/napalm_base/test/getters.py', 78, u'Skipped: Method not implemented')"}, "duration": 0.0009353160858154297, "outcome": "skipped"}, "type": "test", "id": 3}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_network_instances[no_test_case_found]", "teardown": {"duration": 7.104873657226562e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0004589557647705078, "outcome": "passed", "name": "setup"}, "run_index": 8, "call": {"duration": 0.000125885009765625, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm/lib/python2.7/site-packages/napalm_base/test/getters.py', 78, u'Skipped: Method not implemented')"}, "duration": 0.0011148452758789062, "outcome": "skipped"}, "type": "test", "id": 4}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_probes_config[no_test_case_found]", "teardown": {"duration": 7.009506225585938e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003409385681152344, "outcome": "passed", "name": "setup"}, "run_index": 3, "call": {"duration": 0.00026488304138183594, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm/lib/python2.7/site-packages/napalm_base/test/getters.py', 78, u'Skipped: Method not implemented')"}, "duration": 0.001016855239868164, "outcome": "skipped"}, "type": "test", "id": 5}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_ntp_servers[no_test_case_found]", "teardown": {"duration": 0.00011706352233886719, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.007989168167114258, "outcome": "passed", "name": "setup"}, "run_index": 0, "call": {"duration": 0.00020694732666015625, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm/lib/python2.7/site-packages/napalm_base/test/getters.py', 78, u'Skipped: Method not implemented')"}, "duration": 0.01630234718322754, "outcome": "skipped"}, "type": "test", "id": 6}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_users[no_test_case_found]", "teardown": {"duration": 6.29425048828125e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.00034308433532714844, "outcome": "passed", "name": "setup"}, "run_index": 18, "call": {"duration": 0.00011801719665527344, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm/lib/python2.7/site-packages/napalm_base/test/getters.py', 78, u'Skipped: Method not implemented')"}, "duration": 0.0008671283721923828, "outcome": "skipped"}, "type": "test", "id": 7}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_interfaces_counters[normal]", "teardown": {"duration": 7.891654968261719e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003077983856201172, "outcome": "passed", "name": "setup"}, "run_index": 10, "call": {"duration": 0.007678031921386719, "outcome": "passed", "name": "call"}, "duration": 0.00837254524230957, "outcome": "passed"}, "type": "test", "id": 8}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_config[normal]", "teardown": {"duration": 6.29425048828125e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.00037789344787597656, "outcome": "passed", "name": "setup"}, "run_index": 25, "call": {"duration": 0.0005838871002197266, "outcome": "passed", "name":Line truncated
|
||||
{"included": [{"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_bgp_neighbors[normal]", "teardown": {"duration": 8.58306884765625e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003390312194824219, "outcome": "passed", "name": "setup"}, "run_index": 12, "call": {"duration": 0.005239963531494141, "outcome": "passed", "name": "call"}, "duration": 0.006003856658935547, "outcome": "passed"}, "type": "test", "id": 1}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_route_to[no_test_case_found]", "teardown": {"duration": 8.511543273925781e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003371238708496094, "outcome": "passed", "name": "setup"}, "run_index": 14, "call": {"duration": 0.00011587142944335938, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm-fortios/lib/python2.7/site-packages/napalm_base/test/getters.py', 82, u'Skipped: Method not implemented')"}, "duration": 0.0008752346038818359, "outcome": "skipped"}, "type": "test", "id": 2}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_probes_config[no_test_case_found]", "teardown": {"duration": 9.894371032714844e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003809928894042969, "outcome": "passed", "name": "setup"}, "run_index": 4, "call": {"duration": 0.00012493133544921875, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm-fortios/lib/python2.7/site-packages/napalm_base/test/getters.py', 82, u'Skipped: Method not implemented')"}, "duration": 0.000985860824584961, "outcome": "skipped"}, "type": "test", "id": 3}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_firewall_policies[normal]", "teardown": {"duration": 8.702278137207031e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003581047058105469, "outcome": "passed", "name": "setup"}, "run_index": 3, "call": {"duration": 0.00040602684020996094, "outcome": "passed", "name": "call"}, "duration": 0.001209259033203125, "outcome": "passed"}, "type": "test", "id": 4}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_network_instances[no_test_case_found]", "teardown": {"duration": 8.511543273925781e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.00034117698669433594, "outcome": "passed", "name": "setup"}, "run_index": 9, "call": {"duration": 0.0001308917999267578, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm-fortios/lib/python2.7/site-packages/napalm_base/test/getters.py', 82, u'Skipped: Method not implemented')"}, "duration": 0.0008983612060546875, "outcome": "skipped"}, "type": "test", "id": 5}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_arp_table[no_test_case_found]", "teardown": {"duration": 7.390975952148438e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003800392150878906, "outcome": "passed", "name": "setup"}, "run_index": 1, "call": {"duration": 0.0001380443572998047, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm-fortios/lib/python2.7/site-packages/napalm_base/test/getters.py', 82, u'Skipped: Method not implemented')"}, "duration": 0.0009720325469970703, "outcome": "skipped"}, "type": "test", "id": 6}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_ntp_servers[no_test_case_found]", "teardown": {"duration": 0.00010395050048828125, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.007408857345581055, "outcome": "passed", "name": "setup"}, "run_index": 0, "call": {"duration": 0.0002319812774658203, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm-fortios/lib/python2.7/site-packages/napalm_base/test/getters.py', 82, u'Skipped: Method not implemented')"}, "duration": 0.015153646469116211, "outcome": "skipped"}, "type": "test", "id": 7}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_users[no_test_case_found]", "teardown": {"duration": 8.392333984375e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.00033593177795410156, "outcome": "passed", "name": "setup"}, "run_index": 19, "call": {"duration": 0.00011301040649414062, "outcome": "skipped", "name": "call", "longrepr": "('/Users/dbarroso/.virtualenvs/napalm-fortios/lib/python2.7/site-packages/napalm_base/test/getters.py', 82, u'Skipped: Method not implemented')"}, "duration": 0.0008687973022460938, "outcome": "skipped"}, "type": "test", "id": 8}, {"attributes": {"name": "test/unit/test_getters.py::TestGetter::()::test_get_interfaces_counters[normal]", "teardown": {"duration": 8.416175842285156e-05, "outcome": "passed", "name": "teardown"}, "setup": {"duration": 0.0003409385681152344, "outcome": "passed", "name": "setup"}, "run_index": 11, "call": {"duLine truncated
|
||||
Reference in new issue
Block a user