8 Commits
Author SHA1 Message Date
David Barroso 61c343d3b7 Merge pull request #34 from napalm-automation/develop
Release 0.3.1
2016-12-29 15:35:04 +01:00
David Barroso 3af1c05fb2 Merge pull request #33 from napalm-automation/release-0.3.1
Release 0.3.1
2016-12-29 15:33:12 +01:00
David Barroso 67a2d4c97e Update setup.py 2016-12-29 15:32:55 +01:00
David Barroso b6026ad12c Merge pull request #32 from napalm-automation/FIX-SIGNATURES
Move to tox
2016-12-29 15:31:13 +01:00
Mircea Ulinic 3055c79c02 Move to tox 2016-12-29 13:54:44 +00:00
David Barroso b9a7d3e992 Merge pull request #30 from napalm-automation/dbarrosop/fix_signatures
Made private methods private
2016-12-05 13:31:29 +01:00
David Barroso f0ac70d2af Ignore report.json 2016-12-05 13:28:30 +01:00
David Barroso 8456b5271a Made private methods private 2016-12-05 13:17:10 +01:00
8 changed files with 51 additions and 44 deletions

No files matched your search

+1
View File
@@ -60,3 +60,4 @@ env
test/unit/test_devices.py
report.json
+8 -14
View File
@@ -1,20 +1,9 @@
language: python
python:
- 2.7
- 2.7
install:
- pip install -r requirements-dev.txt
- pip install .
script:
- py.test
- pylama .
after_success:
- coveralls
- if [ $TRAVIS_TAG ]; then curl -X POST https://readthedocs.org/build/napalm; fi
- pip install tox-travis
- pip install coveralls
deploy:
provider: pypi
user: dbarroso
@@ -23,3 +12,8 @@ deploy:
on:
tags: true
branch: master
script:
- tox
after_success:
- coveralls
- if [ $TRAVIS_TAG ]; then curl -X POST https://readthedocs.org/build/napalm; fi
+27 -24
View File
@@ -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
View File
@@ -1 +0,0 @@
{"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
+1
View File
@@ -1,3 +1,4 @@
coveralls
pytest
pytest-cov
pytest-json
+4 -4
View File
@@ -1,15 +1,15 @@
[pylama]
linters = mccabe,pep8,pyflakes
ignore = D203,C901
skip = build/*,.tox/*
[pylama:pep8]
max_line_length = 100
[tool:pytest]
addopts = --cov=./ -vs
[pytest]
addopts = --cov=napalm_fortios --cov-report term-missing -vs --pylama
json_report = report.json
jsonapi = true
[coverage:run]
include =
napalm_fortios/*
source = napalm_fortios
+1 -1
View File
@@ -12,7 +12,7 @@ reqs = [str(ir.req) for ir in install_reqs]
setup(
name="napalm-fortios",
version="0.3.0",
version="0.3.1",
packages=find_packages(),
author="David Barroso",
author_email="dbarrosop@dravetech.com",
+9
View File
@@ -0,0 +1,9 @@
[tox]
envlist = py27
[testenv]
deps =
-rrequirements-dev.txt
commands=
py.test