[PATCH v2 43/47] Controller, Devices: removing unused imports

From: Ondrej Lichtner <olichtne(a)redhat.com&gt; Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst/Controller/Common.py | 2 -- lnst/Controller/Controller.py | 4 +--- lnst/Controller/CtlSecSocket.py | 1 - lnst/Controller/Host.py | 2 -- lnst/Controller/Job.py | 1 - lnst/Controller/Machine.py | 8 -------- lnst/Controller/MessageDispatcher.py | 2 +- lnst/Controller/Recipe.py | 1 - lnst/Devices/Device.py | 2 +- lnst/Devices/__init__.py | 1 - 10 files changed, 3 insertions(+), 21 deletions(-) diff --git a/lnst/Controller/Common.py b/lnst/Controller/Common.py index c9e5771..5e00de6 100644 --- a/lnst/Controller/Common.py +++ b/lnst/Controller/Common.py @@ -11,8 +11,6 @@ __author__ = """ olichtne(a)redhat.com (Ondrej Lichtner) """ -import os -import sys from lnst.Common.LnstError import LnstError class ControllerError(LnstError): diff --git a/lnst/Controller/Controller.py b/lnst/Controller/Controller.py index 7848750..dd0dd41 100644 --- a/lnst/Controller/Controller.py +++ b/lnst/Controller/Controller.py @@ -16,19 +16,17 @@ import os import sys import datetime import logging -import socket from lnst.Common.Logs import LoggingCtl from lnst.Common.NetUtils import MacPool from lnst.Common.LnstError import LnstError from lnst.Common.Utils import mkdir_p -from lnst.Devices import VirtualDevice +from lnst.Devices.VirtualDevice import VirtualDevice from lnst.Controller.Common import ControllerError from lnst.Controller.Config import CtlConfig from lnst.Controller.MessageDispatcher import MessageDispatcher from lnst.Controller.SlavePoolManager import SlavePoolManager from lnst.Controller.MachineMapper import MachineMapper from lnst.Controller.Host import Hosts, Host -from lnst.Controller.Requirements import DeviceReq from lnst.Controller.Recipe import BaseRecipe class Controller(object): diff --git a/lnst/Controller/CtlSecSocket.py b/lnst/Controller/CtlSecSocket.py index c80917b..0d30a10 100644 --- a/lnst/Controller/CtlSecSocket.py +++ b/lnst/Controller/CtlSecSocket.py @@ -13,7 +13,6 @@ olichtne(a)redhat.com (Ondrej Lichtner) import os import hashlib -import math import logging from lnst.Common.SecureSocket import SecureSocket from lnst.Common.SecureSocket import DH_GROUP, SRP_GROUP diff --git a/lnst/Controller/Host.py b/lnst/Controller/Host.py index 23cdadf..09e79f8 100644 --- a/lnst/Controller/Host.py +++ b/lnst/Controller/Host.py @@ -12,9 +12,7 @@ olichtne(a)redhat.com (Ondrej Lichtner) """ import logging -from lnst.Common.Colours import decorate_with_preset from lnst.Common.Parameters import Parameters -from lnst.Common.TestModule import BaseTestModule from lnst.Common.NetTestCommand import DEFAULT_TIMEOUT from lnst.Devices import Devices from lnst.Devices.VirtualDevice import VirtualDevice diff --git a/lnst/Controller/Job.py b/lnst/Controller/Job.py index 985364e..ce323a8 100644 --- a/lnst/Controller/Job.py +++ b/lnst/Controller/Job.py @@ -13,7 +13,6 @@ olichtne(a)redhat.com (Ondrej Lichtner) import logging import signal -import copy_reg from lnst.Common.JobError import JobError from lnst.Common.TestModule import BaseTestModule diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py index 2c54f23..dc150d6 100644 --- a/lnst/Controller/Machine.py +++ b/lnst/Controller/Machine.py @@ -13,19 +13,11 @@ rpazdera(a)redhat.com (Radek Pazdera) import logging import socket -import os import sys -import tempfile import signal -from time import sleep -from xmlrpclib import Binary -from lnst.Common.NetUtils import normalize_hwaddr from lnst.Common.Utils import sha256sum -from lnst.Common.Utils import wait_for, create_tar_archive from lnst.Common.Utils import check_process_running from lnst.Common.TestModule import BaseTestModule -from lnst.Common.NetTestCommand import DEFAULT_TIMEOUT -from lnst.Common.DeviceError import DeviceDeleted, DeviceNotFound from lnst.Controller.Common import ControllerError from lnst.Controller.CtlSecSocket import CtlSecSocket from lnst.Devices import device_classes diff --git a/lnst/Controller/MessageDispatcher.py b/lnst/Controller/MessageDispatcher.py index a6d7f44..0f3d23d 100644 --- a/lnst/Controller/MessageDispatcher.py +++ b/lnst/Controller/MessageDispatcher.py @@ -15,7 +15,7 @@ olichtne(a)redhat.com (Ondrej Lichtner) """ import logging -from lnst.Common.ConnectionHandler import send_data, recv_data +from lnst.Common.ConnectionHandler import send_data from lnst.Common.ConnectionHandler import ConnectionHandler from lnst.Common.DeviceRef import DeviceRef from lnst.Controller.Common import ControllerError diff --git a/lnst/Controller/Recipe.py b/lnst/Controller/Recipe.py index d4f33f9..445cb38 100644 --- a/lnst/Controller/Recipe.py +++ b/lnst/Controller/Recipe.py @@ -13,7 +13,6 @@ olichtne(a)redhat.com (Ondrej Lichtner) import copy from lnst.Common.Parameters import Parameters, Param from lnst.Controller.Requirements import _Requirements, HostReq -from lnst.Controller.Host import Hosts, Host from lnst.Controller.Common import ControllerError class RecipeError(ControllerError): diff --git a/lnst/Devices/Device.py b/lnst/Devices/Device.py index 8ba59f2..cf7c5ca 100644 --- a/lnst/Devices/Device.py +++ b/lnst/Devices/Device.py @@ -16,7 +16,7 @@ from abc import ABCMeta from lnst.Common.NetUtils import normalize_hwaddr from lnst.Common.ExecCmd import exec_cmd from lnst.Common.DeviceError import DeviceError, DeviceDeleted -from lnst.Common.IpAddress import Ip4Address, Ip6Address, IpAddress +from lnst.Common.IpAddress import IpAddress try: from pyroute2.netlink.iproute import RTM_NEWLINK diff --git a/lnst/Devices/__init__.py b/lnst/Devices/__init__.py index 2f8d4d1..743c8f5 100644 --- a/lnst/Devices/__init__.py +++ b/lnst/Devices/__init__.py @@ -9,7 +9,6 @@ from lnst.Devices.VxlanDevice import VxlanDevice from lnst.Devices.VtiDevice import VtiDevice, Vti6Device from lnst.Devices.VethDevice import VethDevice, PairedVethDevice from lnst.Devices.VethPair import VethPair -from lnst.Devices.VirtualDevice import VirtualDevice from lnst.Devices.RemoteDevice import RemoteDevice, remotedev_decorator device_classes = [ -- 2.13.0