summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorThomas Mangin <thomas.mangin@exa.net.uk>2020-03-25 09:34:58 +0000
committerThomas Mangin <thomas.mangin@exa.net.uk>2020-03-25 09:34:58 +0000
commitc0b55338a9503a7db49690fca0ec028bb8683875 (patch)
treeaf24cc429bb74b69bc8d580569d9270c1565cb2f /scripts
parentaedc1fcdd2d0656b1252ba6680b0158c7e7ee7af (diff)
downloadvyos-1x-c0b55338a9503a7db49690fca0ec028bb8683875.tar.gz
vyos-1x-c0b55338a9503a7db49690fca0ec028bb8683875.zip
update to use Interface.listing
Diffstat (limited to 'scripts')
-rw-r--r--scripts/cli/base_interfaces_test.py2
-rwxr-xr-xscripts/cli/test_interfaces_bonding.py4
-rwxr-xr-xscripts/cli/test_interfaces_bridge.py4
-rwxr-xr-xscripts/cli/test_interfaces_ethernet.py4
4 files changed, 7 insertions, 7 deletions
diff --git a/scripts/cli/base_interfaces_test.py b/scripts/cli/base_interfaces_test.py
index 9fa0fb49e..1fa5472d5 100644
--- a/scripts/cli/base_interfaces_test.py
+++ b/scripts/cli/base_interfaces_test.py
@@ -18,7 +18,7 @@ import unittest
from vyos.configsession import ConfigSession
from netifaces import ifaddresses, AF_INET, AF_INET6
from vyos.validate import is_intf_addr_assigned, is_ipv6_link_local
-from vyos.interfaces import list_interfaces_of_type
+from vyos.ifconfig import Interface
class BasicInterfaceTest:
class BaseTest(unittest.TestCase):
diff --git a/scripts/cli/test_interfaces_bonding.py b/scripts/cli/test_interfaces_bonding.py
index ecd12b957..36433ed62 100755
--- a/scripts/cli/test_interfaces_bonding.py
+++ b/scripts/cli/test_interfaces_bonding.py
@@ -18,7 +18,7 @@ import unittest
from base_interfaces_test import BasicInterfaceTest
-from vyos.interfaces import list_interfaces_of_type
+from vyos.ifconfig import Interface
from vyos.configsession import ConfigSessionError
class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
@@ -33,7 +33,7 @@ class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
members = []
# we need to filter out VLAN interfaces identified by a dot (.)
# in their name - just in case!
- for tmp in list_interfaces_of_type("ethernet"):
+ for tmp in Interface.listing("ethernet"):
if not '.' in tmp:
members.append(tmp)
diff --git a/scripts/cli/test_interfaces_bridge.py b/scripts/cli/test_interfaces_bridge.py
index 100f6fdf2..af6b62724 100755
--- a/scripts/cli/test_interfaces_bridge.py
+++ b/scripts/cli/test_interfaces_bridge.py
@@ -17,7 +17,7 @@
import unittest
from base_interfaces_test import BasicInterfaceTest
-from vyos.interfaces import list_interfaces_of_type
+from vyos.ifconfig import Interface
class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
def setUp(self):
@@ -30,7 +30,7 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
members = []
# we need to filter out VLAN interfaces identified by a dot (.)
# in their name - just in case!
- for tmp in list_interfaces_of_type("ethernet"):
+ for tmp in Interface.listing("ethernet"):
if not '.' in tmp:
members.append(tmp)
diff --git a/scripts/cli/test_interfaces_ethernet.py b/scripts/cli/test_interfaces_ethernet.py
index a6c5e902c..ddc6ffb27 100755
--- a/scripts/cli/test_interfaces_ethernet.py
+++ b/scripts/cli/test_interfaces_ethernet.py
@@ -17,7 +17,7 @@
import unittest
from base_interfaces_test import BasicInterfaceTest
-from vyos.interfaces import list_interfaces_of_type
+from vyos.ifconfig import Interface
class EthernetInterfaceTest(BasicInterfaceTest.BaseTest):
def setUp(self):
@@ -29,7 +29,7 @@ class EthernetInterfaceTest(BasicInterfaceTest.BaseTest):
# we need to filter out VLAN interfaces identified by a dot (.)
# in their name - just in case!
- for tmp in list_interfaces_of_type("ethernet"):
+ for tmp in Interface.listing("ethernet"):
if not '.' in tmp:
self._interfaces.append(tmp)