From c0b55338a9503a7db49690fca0ec028bb8683875 Mon Sep 17 00:00:00 2001 From: Thomas Mangin Date: Wed, 25 Mar 2020 09:34:58 +0000 Subject: update to use Interface.listing --- scripts/cli/base_interfaces_test.py | 2 +- scripts/cli/test_interfaces_bonding.py | 4 ++-- scripts/cli/test_interfaces_bridge.py | 4 ++-- scripts/cli/test_interfaces_ethernet.py | 4 ++-- 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) -- cgit v1.2.3