13 Commits
Author SHA1 Message Date
Eric Beahan 670f7e8a0d Merge pull request #45 from napalm-automation/develop
Merge 0.4.0
2017-04-01 17:14:12 -05:00
Eric Beahan 0a0b87d4f4 Merge pull request #44 from ebeahan/version_bump
version bump to 0.4.0
2017-04-01 17:05:00 -05:00
Eric Beahan 4b78a4d731 version bump to 0.4.0 2017-04-01 17:00:57 -05:00
Eric Beahan 60a5cc5764 Merge pull request #43 from ebeahan/bump_pyfg_version
bumping pyFG version for python3 support
2017-04-01 16:51:18 -05:00
Eric Beahan fbe3c04cbb bumping pyFG version for python3 support 2017-04-01 16:38:26 -05:00
Eric Beahan 73afe433cc Merge pull request #36 from ktbyers/develop
Add Python3 support
2017-02-09 21:22:03 -06:00
Kirk Byers 2ccad9982f Fix testing issue show firewall policy, dictionary order issue 2017-02-09 12:17:49 -08:00
Kirk Byers b0308075f4 Use pyfg that supports PY3 2017-02-09 10:25:50 -08:00
Kirk Byers 13a82b7e81 Enabling PY3 tests 2017-01-11 20:41:52 -08:00
Kirk Byers 62299ccf28 Fixing bug with is_critical 2017-01-11 20:35:43 -08:00
Kirk Byers f9d7bd0aa9 Fix iteritems for py3 2017-01-11 17:59:39 -08:00
Kirk Byers 8a1779b10a Python3 unicode fixes 2017-01-11 17:57:24 -08:00
Kirk Byers 60ccca9441 Removing coveralls duplication 2017-01-03 21:17:44 -08:00
8 changed files with 33 additions and 39 deletions

No files matched your search

+2
View File
@@ -1,6 +1,8 @@
language: python language: python
python: python:
- 2.7 - 2.7
- 3.4
- 3.5
install: install:
- pip install tox-travis - pip install tox-travis
- pip install coveralls - pip install coveralls
+26 -22
View File
@@ -11,6 +11,8 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under # License for the specific language governing permissions and limitations under
# the License. # the License.
from __future__ import unicode_literals
import re import re
from pyFG.fortios import FortiOS, FortiConfig, logger from pyFG.fortios import FortiOS, FortiConfig, logger
from pyFG.exceptions import FailedCommit, CommandExecutionException from pyFG.exceptions import FailedCommit, CommandExecutionException
@@ -18,6 +20,7 @@ from napalm_base.base import NetworkDriver
from napalm_base.exceptions import ReplaceConfigException, MergeConfigException from napalm_base.exceptions import ReplaceConfigException, MergeConfigException
from napalm_base.utils.string_parsers import colon_separated_string_to_dict,\ from napalm_base.utils.string_parsers import colon_separated_string_to_dict,\
convert_uptime_string_seconds convert_uptime_string_seconds
from napalm_base.utils import py23_compat
class FortiOSDriver(NetworkDriver): class FortiOSDriver(NetworkDriver):
@@ -164,7 +167,7 @@ class FortiOSDriver(NetworkDriver):
return { return {
'startup': u"", 'startup': u"",
'running': unicode(text_result), 'running': py23_compat.text_type(text_result),
'candidate': u"", 'candidate': u"",
} }
@@ -188,12 +191,12 @@ class FortiOSDriver(NetworkDriver):
vdom='global')['domain'] vdom='global')['domain']
return { return {
'vendor': unicode('Fortigate'), 'vendor': py23_compat.text_type('Fortigate'),
'os_version': unicode(system_status['Version'].split(',')[0].split()[1]), 'os_version': py23_compat.text_type(system_status['Version'].split(',')[0].split()[1]),
'uptime': convert_uptime_string_seconds(performance_status['Uptime']), 'uptime': convert_uptime_string_seconds(performance_status['Uptime']),
'serial_number': unicode(system_status['Serial-Number']), 'serial_number': py23_compat.text_type(system_status['Serial-Number']),
'model': unicode(system_status['Version'].split(',')[0].split()[0]), 'model': py23_compat.text_type(system_status['Version'].split(',')[0].split()[0]),
'hostname': unicode(system_status['Hostname']), 'hostname': py23_compat.text_type(system_status['Hostname']),
'fqdn': u'{}.{}'.format(system_status['Hostname'], domain), 'fqdn': u'{}.{}'.format(system_status['Hostname'], domain),
'interface_list': interface_list 'interface_list': interface_list
} }
@@ -239,7 +242,7 @@ class FortiOSDriver(NetworkDriver):
elif line.startswith('Link'): elif line.startswith('Link'):
parsed_data['is_up'] = line.split('\t')[-1] is 'up' parsed_data['is_up'] = line.split('\t')[-1] is 'up'
elif line.startswith('Current_HWaddr'): elif line.startswith('Current_HWaddr'):
parsed_data['mac_address'] = unicode(line.split('\t')[-1]) parsed_data['mac_address'] = py23_compat.text_type(line.split('\t')[-1])
parsed_data['is_enabled'] = True parsed_data['is_enabled'] = True
parsed_data['description'] = u'' parsed_data['description'] = u''
parsed_data['last_flapped'] = -1.0 parsed_data['last_flapped'] = -1.0
@@ -252,7 +255,7 @@ class FortiOSDriver(NetworkDriver):
elif line.startswith('PHY Speed'): elif line.startswith('PHY Speed'):
parsed_data['speed'] = int(line.split(':')[-1]) parsed_data['speed'] = int(line.split(':')[-1])
elif line.startswith('Current_HWaddr'): elif line.startswith('Current_HWaddr'):
parsed_data['mac_address'] = unicode(line.split(' ')[-1]) parsed_data['mac_address'] = py23_compat.text_type(line.split(' ')[-1])
parsed_data['description'] = u'' parsed_data['description'] = u''
parsed_data['last_flapped'] = -1.0 parsed_data['last_flapped'] = -1.0
interface_statistics[interface] = parsed_data interface_statistics[interface] = parsed_data
@@ -294,16 +297,16 @@ class FortiOSDriver(NetworkDriver):
policy_item['position'] = position policy_item['position'] = position
policy_item['packet_hits'] = -1 policy_item['packet_hits'] = -1
policy_item['byte_hits'] = -1 policy_item['byte_hits'] = -1
policy_item['id'] = unicode(key) policy_item['id'] = py23_compat.text_type(key)
policy_item['enabled'] = enabled policy_item['enabled'] = enabled
policy_item['schedule'] = unicode(policy[key]['schedule']) policy_item['schedule'] = py23_compat.text_type(policy[key]['schedule'])
policy_item['log'] = unicode(logtraffic) policy_item['log'] = py23_compat.text_type(logtraffic)
policy_item['l3_src'] = unicode(policy[key]['srcaddr']) policy_item['l3_src'] = py23_compat.text_type(policy[key]['srcaddr'])
policy_item['l3_dst'] = unicode(policy[key]['dstaddr']) policy_item['l3_dst'] = py23_compat.text_type(policy[key]['dstaddr'])
policy_item['service'] = unicode(policy[key]['service']) policy_item['service'] = py23_compat.text_type(policy[key]['service'])
policy_item['src_zone'] = unicode(policy[key]['srcintf']) policy_item['src_zone'] = py23_compat.text_type(policy[key]['srcintf'])
policy_item['dst_zone'] = unicode(policy[key]['dstintf']) policy_item['dst_zone'] = py23_compat.text_type(policy[key]['dstintf'])
policy_item['action'] = unicode(action) policy_item['action'] = py23_compat.text_type(action)
default_policy[key].append(policy_item) default_policy[key].append(policy_item)
position = position + 1 position = position + 1
@@ -325,7 +328,7 @@ class FortiOSDriver(NetworkDriver):
self.device.load_config('router bgp') self.device.load_config('router bgp')
for neighbor, parameters in neighbors.iteritems(): for neighbor, parameters in neighbors.items():
logger.debug('NEW PEER') logger.debug('NEW PEER')
neigh_conf = self.device.running_config['router bgp']['neighbor']['{}'.format(neighbor)] neigh_conf = self.device.running_config['router bgp']['neighbor']['{}'.format(neighbor)]
@@ -346,7 +349,7 @@ class FortiOSDriver(NetworkDriver):
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)) m = re.search('remote router id (.+?)\n', '\n'.join(detail_output))
if m: if m:
neighbor_dict['remote_id'] = unicode(m.group(1)) neighbor_dict['remote_id'] = py23_compat.text_type(m.group(1))
else: else:
raise Exception('cannot find remote router id for %s' % neighbor) raise Exception('cannot find remote router id for %s' % neighbor)
@@ -355,7 +358,7 @@ class FortiOSDriver(NetworkDriver):
x = detail_output.index(' for address family: {} unicast'.format(family)) x = detail_output.index(' for address family: {} unicast'.format(family))
block = detail_output[x:] block = detail_output[x:]
for term, fortiname in terms.iteritems(): for term, fortiname in terms.items():
text = self._search_line_in_lines('%s prefixes' % fortiname, block) text = self._search_line_in_lines('%s prefixes' % fortiname, block)
t = [int(s) for s in text.split() if s.isdigit()][0] t = [int(s) for s in text.split() if s.isdigit()][0]
neighbor_dict['address_family'][family][term] = t neighbor_dict['address_family'][family][term] = t
@@ -371,7 +374,7 @@ class FortiOSDriver(NetworkDriver):
return { return {
'global': { 'global': {
'router_id': unicode(bgp_sum[0].split()[3]), 'router_id': py23_compat.text_type(bgp_sum[0].split()[3]),
'peers': peers 'peers': peers
} }
} }
@@ -465,9 +468,10 @@ class FortiOSDriver(NetworkDriver):
v = int(self._search_line_in_lines('upper_non_recoverable', v = int(self._search_line_in_lines('upper_non_recoverable',
sensor_block).split('=')[1]) sensor_block).split('=')[1])
temp_value = int(temp_value)
output[sensor_name] = dict(temperature=float(temp_value), is_alert=is_alert, output[sensor_name] = dict(temperature=float(temp_value), is_alert=is_alert,
is_critical=True if v > temp_value else False) is_critical=True if temp_value > v else False)
return output return output
-1
View File
@@ -5,5 +5,4 @@ pytest-json
pytest-pythonpath pytest-pythonpath
pylama pylama
flake8-import-order flake8-import-order
coveralls
-r requirements.txt -r requirements.txt
+2 -2
View File
@@ -1,3 +1,3 @@
napalm-base>=0.18.0 napalm-base>=0.23.0
pyFG pyFG>=0.49_1
future future
+1 -1
View File
@@ -12,7 +12,7 @@ reqs = [str(ir.req) for ir in install_reqs]
setup( setup(
name="napalm-fortios", name="napalm-fortios",
version="0.3.1", version="0.4.0",
packages=find_packages(), packages=find_packages(),
author="David Barroso", author="David Barroso",
author_email="dbarrosop@dravetech.com", author_email="dbarrosop@dravetech.com",
@@ -1 +1 @@
{"1": [{"src_zone": "any", "log": "False", "service": "ALL", "schedule": "always", "l3_src": "all", "enabled": false, "packet_hits": -1, "l3_dst": "all", "dst_zone": "any", "action": "permit", "position": 1, "byte_hits": -1, "id": "1"}], "2": [{"src_zone": "port3", "log": "all", "service": "ALL", "schedule": "always", "l3_src": "all", "enabled": false, "packet_hits": -1, "l3_dst": "all", "dst_zone": "port2", "action": "reject", "position": 2, "byte_hits": -1, "id": "2"}]} {"1": [{"src_zone": "any", "log": "False", "service": "ALL", "schedule": "always", "l3_src": "all", "enabled": false, "packet_hits": -1, "l3_dst": "all", "dst_zone": "any", "action": "permit", "position": 1, "byte_hits": -1, "id": "1"}] }
@@ -9,15 +9,4 @@ config firewall policy
set schedule "always" set schedule "always"
set service "ALL" set service "ALL"
next next
edit 2
set name "bla"
set uuid de597b64-aca8-51e6-5d00-b7874e6b72b8
set srcintf "port3"
set dstintf "port2"
set srcaddr "all"
set dstaddr "all"
set schedule "always"
set service "ALL"
set logtraffic all
next
end end
+1 -1
View File
@@ -1,5 +1,5 @@
[tox] [tox]
envlist = py27 envlist = py27,py34,py35
[testenv] [testenv]
deps = deps =