[Python-modules-commits] [napalm-fortios] 01/03: New upstream release.
Vincent Bernat
bernat at moszumanska.debian.org
Tue Nov 14 09:45:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
bernat pushed a commit to annotated tag debian/0.4.0-1
in repository napalm-fortios.
commit 99ac93adffb2622fbbc01a9ccd6ecaa94c29a856
Author: Vincent Bernat <bernat at debian.org>
Date: Tue Nov 14 10:43:25 2017 +0100
New upstream release.
---
PKG-INFO | 2 +-
napalm_fortios.egg-info/PKG-INFO | 2 +-
napalm_fortios.egg-info/requires.txt | 4 +--
napalm_fortios/fortios.py | 48 +++++++++++++++++++-----------------
requirements.txt | 4 +--
setup.py | 2 +-
6 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index c9eccdc..8289f24 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: napalm-fortios
-Version: 0.3.1
+Version: 0.4.0
Summary: Network Automation and Programmability Abstraction Layer with Multivendor support
Home-page: https://github.com/napalm-automation/napalm-fortios
Author: David Barroso
diff --git a/napalm_fortios.egg-info/PKG-INFO b/napalm_fortios.egg-info/PKG-INFO
index c9eccdc..8289f24 100644
--- a/napalm_fortios.egg-info/PKG-INFO
+++ b/napalm_fortios.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: napalm-fortios
-Version: 0.3.1
+Version: 0.4.0
Summary: Network Automation and Programmability Abstraction Layer with Multivendor support
Home-page: https://github.com/napalm-automation/napalm-fortios
Author: David Barroso
diff --git a/napalm_fortios.egg-info/requires.txt b/napalm_fortios.egg-info/requires.txt
index 0554366..6ec64b1 100644
--- a/napalm_fortios.egg-info/requires.txt
+++ b/napalm_fortios.egg-info/requires.txt
@@ -1,3 +1,3 @@
-napalm-base>=0.18.0
-pyFG
+napalm-base>=0.23.0
+pyFG>=0.49_1
future
diff --git a/napalm_fortios/fortios.py b/napalm_fortios/fortios.py
index a9cddcc..c7fc01b 100644
--- a/napalm_fortios/fortios.py
+++ b/napalm_fortios/fortios.py
@@ -11,6 +11,8 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
+from __future__ import unicode_literals
+
import re
from pyFG.fortios import FortiOS, FortiConfig, logger
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.utils.string_parsers import colon_separated_string_to_dict,\
convert_uptime_string_seconds
+from napalm_base.utils import py23_compat
class FortiOSDriver(NetworkDriver):
@@ -164,7 +167,7 @@ class FortiOSDriver(NetworkDriver):
return {
'startup': u"",
- 'running': unicode(text_result),
+ 'running': py23_compat.text_type(text_result),
'candidate': u"",
}
@@ -188,12 +191,12 @@ class FortiOSDriver(NetworkDriver):
vdom='global')['domain']
return {
- 'vendor': unicode('Fortigate'),
- 'os_version': unicode(system_status['Version'].split(',')[0].split()[1]),
+ 'vendor': py23_compat.text_type('Fortigate'),
+ 'os_version': py23_compat.text_type(system_status['Version'].split(',')[0].split()[1]),
'uptime': convert_uptime_string_seconds(performance_status['Uptime']),
- 'serial_number': unicode(system_status['Serial-Number']),
- 'model': unicode(system_status['Version'].split(',')[0].split()[0]),
- 'hostname': unicode(system_status['Hostname']),
+ 'serial_number': py23_compat.text_type(system_status['Serial-Number']),
+ 'model': py23_compat.text_type(system_status['Version'].split(',')[0].split()[0]),
+ 'hostname': py23_compat.text_type(system_status['Hostname']),
'fqdn': u'{}.{}'.format(system_status['Hostname'], domain),
'interface_list': interface_list
}
@@ -239,7 +242,7 @@ class FortiOSDriver(NetworkDriver):
elif line.startswith('Link'):
parsed_data['is_up'] = line.split('\t')[-1] is 'up'
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['description'] = u''
parsed_data['last_flapped'] = -1.0
@@ -252,7 +255,7 @@ class FortiOSDriver(NetworkDriver):
elif line.startswith('PHY Speed'):
parsed_data['speed'] = int(line.split(':')[-1])
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['last_flapped'] = -1.0
interface_statistics[interface] = parsed_data
@@ -294,16 +297,16 @@ class FortiOSDriver(NetworkDriver):
policy_item['position'] = position
policy_item['packet_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['schedule'] = unicode(policy[key]['schedule'])
- policy_item['log'] = unicode(logtraffic)
- policy_item['l3_src'] = unicode(policy[key]['srcaddr'])
- policy_item['l3_dst'] = unicode(policy[key]['dstaddr'])
- policy_item['service'] = unicode(policy[key]['service'])
- policy_item['src_zone'] = unicode(policy[key]['srcintf'])
- policy_item['dst_zone'] = unicode(policy[key]['dstintf'])
- policy_item['action'] = unicode(action)
+ policy_item['schedule'] = py23_compat.text_type(policy[key]['schedule'])
+ policy_item['log'] = py23_compat.text_type(logtraffic)
+ policy_item['l3_src'] = py23_compat.text_type(policy[key]['srcaddr'])
+ policy_item['l3_dst'] = py23_compat.text_type(policy[key]['dstaddr'])
+ policy_item['service'] = py23_compat.text_type(policy[key]['service'])
+ policy_item['src_zone'] = py23_compat.text_type(policy[key]['srcintf'])
+ policy_item['dst_zone'] = py23_compat.text_type(policy[key]['dstintf'])
+ policy_item['action'] = py23_compat.text_type(action)
default_policy[key].append(policy_item)
position = position + 1
@@ -325,7 +328,7 @@ class FortiOSDriver(NetworkDriver):
self.device.load_config('router bgp')
- for neighbor, parameters in neighbors.iteritems():
+ for neighbor, parameters in neighbors.items():
logger.debug('NEW PEER')
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))]
m = re.search('remote router id (.+?)\n', '\n'.join(detail_output))
if m:
- neighbor_dict['remote_id'] = unicode(m.group(1))
+ neighbor_dict['remote_id'] = py23_compat.text_type(m.group(1))
else:
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))
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)
t = [int(s) for s in text.split() if s.isdigit()][0]
neighbor_dict['address_family'][family][term] = t
@@ -371,7 +374,7 @@ class FortiOSDriver(NetworkDriver):
return {
'global': {
- 'router_id': unicode(bgp_sum[0].split()[3]),
+ 'router_id': py23_compat.text_type(bgp_sum[0].split()[3]),
'peers': peers
}
}
@@ -465,9 +468,10 @@ class FortiOSDriver(NetworkDriver):
v = int(self._search_line_in_lines('upper_non_recoverable',
sensor_block).split('=')[1])
+ temp_value = int(temp_value)
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
diff --git a/requirements.txt b/requirements.txt
index 0554366..6ec64b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-napalm-base>=0.18.0
-pyFG
+napalm-base>=0.23.0
+pyFG>=0.49_1
future
diff --git a/setup.py b/setup.py
index 934edc1..4e73667 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ reqs = [str(ir.req) for ir in install_reqs]
setup(
name="napalm-fortios",
- version="0.3.1",
+ version="0.4.0",
packages=find_packages(),
author="David Barroso",
author_email="dbarrosop at dravetech.com",
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/napalm-fortios.git
More information about the Python-modules-commits
mailing list