Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
05573195db | ||
|
|
85612c49fc | ||
|
|
77f0c5e42f | ||
|
|
88fdbffa44 | ||
|
|
2fa9c589f6 | ||
|
|
5616a1f7ae |
No files matched your search
@@ -16,12 +16,16 @@ 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
|
||||||
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
|
from napalm_base.utils import py23_compat
|
||||||
|
|
||||||
|
try:
|
||||||
|
from napalm.base.base import NetworkDriver
|
||||||
|
except ImportError:
|
||||||
|
from napalm_base.base import NetworkDriver
|
||||||
|
|
||||||
|
|
||||||
class FortiOSDriver(NetworkDriver):
|
class FortiOSDriver(NetworkDriver):
|
||||||
def __init__(self, hostname, username, password, timeout=60, optional_args=None):
|
def __init__(self, hostname, username, password, timeout=60, optional_args=None):
|
||||||
|
|||||||
@@ -8,11 +8,14 @@ from pip.req import parse_requirements
|
|||||||
__author__ = 'David Barroso <dbarrosop@dravetech.com>'
|
__author__ = 'David Barroso <dbarrosop@dravetech.com>'
|
||||||
|
|
||||||
install_reqs = parse_requirements('requirements.txt', session=uuid.uuid1())
|
install_reqs = parse_requirements('requirements.txt', session=uuid.uuid1())
|
||||||
reqs = [str(ir.req) for ir in install_reqs]
|
try:
|
||||||
|
reqs = [str(ir.req) for ir in install_reqs]
|
||||||
|
except:
|
||||||
|
reqs = [str(ir.requirement) for ir in install_reqs]
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="napalm-fortios",
|
name="napalm-fortios",
|
||||||
version="0.4.0",
|
version="0.4.1",
|
||||||
packages=find_packages(),
|
packages=find_packages(),
|
||||||
author="David Barroso",
|
author="David Barroso",
|
||||||
author_email="dbarrosop@dravetech.com",
|
author_email="dbarrosop@dravetech.com",
|
||||||
|
|||||||
Reference in new issue
Block a user