diff --git a/napalm_vyos/vyos.py b/napalm_vyos/vyos.py index d6560ba..9a6c35c 100644 --- a/napalm_vyos/vyos.py +++ b/napalm_vyos/vyos.py @@ -204,7 +204,10 @@ class VyOSDriver(NetworkDriver): diff = ''.join(output_compare.splitlines(True)[1:-1]) return diff - def commit_config(self): + def commit_config(self, confirmed=None): + if confirmed is not None: + raise NotImplementedError + try: self.device.commit() except ValueError: @@ -358,7 +361,7 @@ class VyOSDriver(NetworkDriver): else: return None - def get_arp_table(self): + def get_arp_table(self, vrf=""): # 'age' is not implemented yet """ @@ -370,6 +373,11 @@ class VyOSDriver(NetworkDriver): 10.129.2.97 ether 00:50:56:9f:64:09 C eth0 192.168.1.3 ether 00:50:56:86:7b:06 C eth1 """ + + if vrf: + msg = "VRF support has not been added for this getter on this platform." + raise NotImplementedError(msg) + output = self.device.send_command("show arp") output = output.split("\n") diff --git a/setup.py b/setup.py index fe85bf1..bf90a64 100644 --- a/setup.py +++ b/setup.py @@ -1,19 +1,13 @@ """setup.py file.""" -import uuid - from setuptools import setup, find_packages -# for pip >= 10 -try: - from pip._internal.req import parse_requirements -except ImportError: - from pip.req import parse_requirements +with open("requirements.txt", "r") as fs: + reqs = [r for r in fs.read().splitlines() + if (len(r) > 0 and not r.startswith("#"))] __author__ = 'Piotr Pieprzycki ' -install_reqs = parse_requirements('requirements.txt', session=uuid.uuid1()) -reqs = [str(ir.req) for ir in install_reqs] setup( name="napalm-vyos", @@ -24,12 +18,17 @@ setup( description="Network Automation and Programmability Abstraction Layer with Multivendor support", classifiers=[ 'Topic :: Utilities', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Operating System :: POSIX :: Linux', - 'Operating System :: MacOS', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Operating System :: POSIX :: Linux', + 'Operating System :: MacOS', ], + url="https://github.com/napalm-automation-community/napalm-vyos", include_package_data=True, install_requires=reqs, )