Merge pull request #21 from ppieprzycki/master

Fix imports to napalm2

napalm_vyos/vyos.py

@@ -30,10 +30,10 @@ from netmiko import ConnectHandler
 from netmiko import SCPConn
 
 # NAPALM base
-import napalm_base.constants as C
+import napalm.base.constants as C
-from napalm_base.utils import py23_compat
+from napalm.base.utils import py23_compat
-from napalm_base.base import NetworkDriver
+from napalm.base.base import NetworkDriver
-from napalm_base.exceptions import ConnectionException, \
+from napalm.base.exceptions import ConnectionException, \
                                    MergeConfigException, ReplaceConfigException
 
 

requirements.txt

@@ -1,4 +1,4 @@
-napalm_base
+napalm==2.*
 paramiko
 netmiko>=1.1.0
 vyattaconfparser

test/unit/TestVyOSDriver.py

@@ -15,7 +15,7 @@
 import unittest
 
 from napalm_vyos import vyos
-from napalm_base.test.base import TestConfigNetworkDriver
+from napalm.base.test.base import TestConfigNetworkDriver
 
 
 class TestConfigVyOSDriver(unittest.TestCase, TestConfigNetworkDriver):

test/unit/conftest.py

@@ -2,10 +2,10 @@
 from builtins import super
 
 import pytest
-from napalm_base.test import conftest as parent_conftest
+from napalm.base.test import conftest as parent_conftest
 
-from napalm_base.test.double import BaseTestDouble
+from napalm.base.test.double import BaseTestDouble
-from napalm_base.utils import py23_compat
+from napalm.base.utils import py23_compat
 
 from napalm_vyos import vyos
 

test/unit/test_getters.py

@@ -1,6 +1,6 @@
 """Tests for getters."""
 
-from napalm_base.test.getters import BaseTestGetters
+from napalm.base.test.getters import BaseTestGetters
 
 
 import pytest

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35
+envlist = py27,py35
 
 [testenv]
 deps =