Merge pull request #316 from thomas-mangin/T2242

import: T2242: remove all import *

5 files changed, 22 insertions, 12 deletions

diff --git a/python/vyos/ifconfig/bond.py b/python/vyos/ifconfig/bond.py
index e2ff71490..47dd4ff34 100644
--- a/python/vyos/ifconfig/bond.py
+++ b/python/vyos/ifconfig/bond.py
@@ -18,7 +18,8 @@ import os
 from vyos.ifconfig.interface import Interface
 from vyos.ifconfig.vlan import VLAN
 
-from vyos.validate import *
+from vyos.validate import assert_list
+from vyos.validate import assert_positive
 
 
 @Interface.register
diff --git a/python/vyos/ifconfig/bridge.py b/python/vyos/ifconfig/bridge.py
index 94b0075d8..44b92c1db 100644
--- a/python/vyos/ifconfig/bridge.py
+++ b/python/vyos/ifconfig/bridge.py
@@ -16,7 +16,8 @@
 
 from vyos.ifconfig.interface import Interface
 
-from vyos.validate import *
+from vyos.validate import assert_boolean
+from vyos.validate import assert_positive
 
 
 @Interface.register
diff --git a/python/vyos/ifconfig/ethernet.py b/python/vyos/ifconfig/ethernet.py
index 291b326bf..542de4f59 100644
--- a/python/vyos/ifconfig/ethernet.py
+++ b/python/vyos/ifconfig/ethernet.py
@@ -18,8 +18,8 @@ import re
 
 from vyos.ifconfig.interface import Interface
 from vyos.ifconfig.vlan import VLAN
+from vyos.validate import assert_list
 from vyos.util import run
-from vyos.validate import *
 
 
 @Interface.register
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 96057a943..22c71a464 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -18,21 +18,29 @@ import re
 import json
 import glob
 import time
+from time import sleep
+from os.path import isfile
 from copy import deepcopy
+from datetime import timedelta
 
-from vyos.validate import *     # should not * include
-from vyos.util import mac2eui64
-from vyos import ConfigError
-
+from hurry.filesize import size, alternative
 from ipaddress import IPv4Network, IPv6Address, IPv6Network
 from netifaces import ifaddresses, AF_INET, AF_INET6
-from time import sleep
-from os.path import isfile
 from tabulate import tabulate
-from hurry.filesize import size,alternative
-from datetime import timedelta
 
+from vyos.util import mac2eui64
+from vyos import ConfigError
 from vyos.ifconfig.dhcp import DHCP
+from vyos.validate import is_ipv4
+from vyos.validate import is_ipv6
+from vyos.validate import is_intf_addr_assigned
+from vyos.validate import assert_boolean
+from vyos.validate import assert_list
+from vyos.validate import assert_mac
+from vyos.validate import assert_mtu
+from vyos.validate import assert_positive
+from vyos.validate import assert_range
+
 
 class Interface(DHCP):
     options = []
diff --git a/python/vyos/ifconfig/stp.py b/python/vyos/ifconfig/stp.py
index 97a3c1ff3..5e83206c2 100644
--- a/python/vyos/ifconfig/stp.py
+++ b/python/vyos/ifconfig/stp.py
@@ -16,7 +16,7 @@
 
 from vyos.ifconfig.interface import Interface
 
-from vyos.validate import *
+from vyos.validate import assert_positive
 
 
 class STP: