Remove unneeded path ammendment and imports
Change-Id: Ibdd09032850a08f2db27c0904897ddaef133747b
diff --git a/TestON/drivers/common/api/controller/onosrestdriver.py b/TestON/drivers/common/api/controller/onosrestdriver.py
index a38b073..b948ce5 100644
--- a/TestON/drivers/common/api/controller/onosrestdriver.py
+++ b/TestON/drivers/common/api/controller/onosrestdriver.py
@@ -19,9 +19,7 @@
import json
import os
import requests
-import sys
-sys.path.append( "../" )
from drivers.common.api.controllerdriver import Controller
diff --git a/TestON/drivers/common/api/controllerdriver.py b/TestON/drivers/common/api/controllerdriver.py
index 5ac112f..1c3b3b8 100644
--- a/TestON/drivers/common/api/controllerdriver.py
+++ b/TestON/drivers/common/api/controllerdriver.py
@@ -19,8 +19,6 @@
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-import sys
-sys.path.append( "../" )
from drivers.common.apidriver import API
diff --git a/TestON/drivers/common/api/fvtapidriver.py b/TestON/drivers/common/api/fvtapidriver.py
index 8203166..eb1632c 100644
--- a/TestON/drivers/common/api/fvtapidriver.py
+++ b/TestON/drivers/common/api/fvtapidriver.py
@@ -35,7 +35,6 @@
import signal
import re
import sys
-sys.path.append( "../" )
from common.apidriver import API
import logging
diff --git a/TestON/drivers/common/apidriver.py b/TestON/drivers/common/apidriver.py
index 7de283c..af66d98 100644
--- a/TestON/drivers/common/apidriver.py
+++ b/TestON/drivers/common/apidriver.py
@@ -20,15 +20,6 @@
"""
-import struct
-import fcntl
-import os
-import sys
-import signal
-import sys
-import re
-sys.path.append( "../" )
-
from drivers.component import Component
diff --git a/TestON/drivers/common/cli/dpclidriver.py b/TestON/drivers/common/cli/dpclidriver.py
index 81743d3..23214b8 100644
--- a/TestON/drivers/common/cli/dpclidriver.py
+++ b/TestON/drivers/common/cli/dpclidriver.py
@@ -2,8 +2,6 @@
Driver for blank dataplane VMs. Created for SDNIP test.
"""
import pexpect
-import sys
-sys.path.append( "../" )
from drivers.common.clidriver import CLI
diff --git a/TestON/drivers/common/cli/emulator/flowvisordriver.py b/TestON/drivers/common/cli/emulator/flowvisordriver.py
index 46c47a7..6ec2ee6 100644
--- a/TestON/drivers/common/cli/emulator/flowvisordriver.py
+++ b/TestON/drivers/common/cli/emulator/flowvisordriver.py
@@ -23,7 +23,6 @@
"""
import re
import sys
-sys.path.append( "../" )
from drivers.common.cli.emulatordriver import Emulator
diff --git a/TestON/drivers/common/cli/emulator/lincoedriver.py b/TestON/drivers/common/cli/emulator/lincoedriver.py
index 0f22b28..ae3eef9 100644
--- a/TestON/drivers/common/cli/emulator/lincoedriver.py
+++ b/TestON/drivers/common/cli/emulator/lincoedriver.py
@@ -17,7 +17,6 @@
import pexpect
import sys
-sys.path.append( "../" )
from drivers.common.cli.emulatordriver import Emulator
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 2baaca9..46058e7 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -36,7 +36,6 @@
import sys
import types
import os
-sys.path.append( "../" )
from math import pow
from drivers.common.cli.emulatordriver import Emulator
diff --git a/TestON/drivers/common/cli/emulator/poxclidriver.py b/TestON/drivers/common/cli/emulator/poxclidriver.py
index 291e916..39effc7 100644
--- a/TestON/drivers/common/cli/emulator/poxclidriver.py
+++ b/TestON/drivers/common/cli/emulator/poxclidriver.py
@@ -25,7 +25,6 @@
import struct
import fcntl
import os
-import sys
import signal
import sys
from drivers.common.cli.emulatordriver import Emulator
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index cea3eab..7ac7912 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -25,7 +25,6 @@
import re
import sys
import os
-sys.path.append( "../" )
from drivers.common.cli.emulatordriver import Emulator
diff --git a/TestON/drivers/common/cli/emulatordriver.py b/TestON/drivers/common/cli/emulatordriver.py
index 778a32b..fa0309e 100644
--- a/TestON/drivers/common/cli/emulatordriver.py
+++ b/TestON/drivers/common/cli/emulatordriver.py
@@ -19,8 +19,6 @@
"""
-import sys
-sys.path.append( "../" )
from drivers.common.clidriver import CLI
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 5200ee5..bb57b9e 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -16,14 +16,12 @@
OCT 13 2014
"""
-import sys
import pexpect
import re
import json
import types
import time
import os
-sys.path.append( "../" )
from drivers.common.clidriver import CLI
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 7520f46..73aa9e2 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -16,14 +16,12 @@
OCT 9 2014
"""
-import sys
import time
import types
import pexpect
import os
import os.path
from requests.models import Response
-sys.path.append( "../" )
from drivers.common.clidriver import CLI
diff --git a/TestON/drivers/common/cli/quaggaclidriver.py b/TestON/drivers/common/cli/quaggaclidriver.py
index 7e3df2b..d325232 100644
--- a/TestON/drivers/common/cli/quaggaclidriver.py
+++ b/TestON/drivers/common/cli/quaggaclidriver.py
@@ -4,7 +4,6 @@
import pexpect
import sys
import json
-sys.path.append( "../" )
from drivers.common.clidriver import CLI
@@ -28,7 +27,6 @@
else:
main.log.info( "NO HANDLE" )
return main.FALSE
-
def connectQuagga( self ):
self.name = self.options[ 'name' ]
diff --git a/TestON/drivers/common/cli/remotesysdriver.py b/TestON/drivers/common/cli/remotesysdriver.py
index a536e02..963b8f4 100644
--- a/TestON/drivers/common/cli/remotesysdriver.py
+++ b/TestON/drivers/common/cli/remotesysdriver.py
@@ -19,15 +19,6 @@
"""
-import time
-import pexpect
-import struct
-import fcntl
-import os
-import sys
-import signal
-import sys
-sys.path.append( "../" )
from drivers.common.clidriver import CLI
diff --git a/TestON/drivers/common/cli/remotetestbed/floodlightclidriver.py b/TestON/drivers/common/cli/remotetestbed/floodlightclidriver.py
index 10e7a85..a000806 100644
--- a/TestON/drivers/common/cli/remotetestbed/floodlightclidriver.py
+++ b/TestON/drivers/common/cli/remotetestbed/floodlightclidriver.py
@@ -21,20 +21,8 @@
FloodLightCliDriver is the basic driver which will handle the Mininet functions
"""
-import pexpect
-import struct
-import fcntl
-import os
-import signal
-import re
-import sys
-import time
-
-sys.path.append( "../" )
-
from drivers.common.cli.remotetestbeddriver import RemoteTestBedDriver
-
class FloodLightCliDriver( RemoteTestBedDriver ):
"""
diff --git a/TestON/drivers/common/cli/remotetestbed/remotepoxdriver.py b/TestON/drivers/common/cli/remotetestbed/remotepoxdriver.py
index 44951aa..6f2f90c 100644
--- a/TestON/drivers/common/cli/remotetestbed/remotepoxdriver.py
+++ b/TestON/drivers/common/cli/remotetestbed/remotepoxdriver.py
@@ -21,17 +21,6 @@
RemoteVMDriver is the basic driver which will handle the Mininet functions
"""
-import pexpect
-import struct
-import fcntl
-import os
-import signal
-import re
-import sys
-import time
-
-sys.path.append( "../" )
-
from drivers.common.cli.remotetestbeddriver import RemoteTestBedDriver
diff --git a/TestON/drivers/common/cli/remotetestbed/remotevmdriver.py b/TestON/drivers/common/cli/remotetestbed/remotevmdriver.py
index 4f97854..892d998 100644
--- a/TestON/drivers/common/cli/remotetestbed/remotevmdriver.py
+++ b/TestON/drivers/common/cli/remotetestbed/remotevmdriver.py
@@ -22,15 +22,6 @@
RemoteVMDriver is the basic driver which will handle the Mininet functions
"""
import pexpect
-import struct
-import fcntl
-import os
-import signal
-import re
-import sys
-import time
-
-sys.path.append( "../" )
from drivers.common.cli.remotetestbeddriver import RemoteTestBedDriver
diff --git a/TestON/drivers/common/cli/remotetestbeddriver.py b/TestON/drivers/common/cli/remotetestbeddriver.py
index eaeacd9..acb9ccc 100644
--- a/TestON/drivers/common/cli/remotetestbeddriver.py
+++ b/TestON/drivers/common/cli/remotetestbeddriver.py
@@ -19,15 +19,6 @@
"""
-import time
-import pexpect
-import struct
-import fcntl
-import os
-import sys
-import signal
-import sys
-sys.path.append( "../" )
from drivers.common.clidriver import CLI
diff --git a/TestON/drivers/common/cli/tool/dpctlclidriver.py b/TestON/drivers/common/cli/tool/dpctlclidriver.py
index 252fb8c..1e5f839 100644
--- a/TestON/drivers/common/cli/tool/dpctlclidriver.py
+++ b/TestON/drivers/common/cli/tool/dpctlclidriver.py
@@ -22,19 +22,8 @@
DPCTL driver class provides the basic functions of DPCTL controller
"""
-import pexpect
-import struct
-import fcntl
-import os
-import sys
-import signal
import sys
from drivers.common.cli.toolsdriver import Tools
-import pydoc
-from drivers.common.clidriver import CLI
-import re
-import os
-import sys
class DpctlCliDriver( Tools ):
@@ -54,7 +43,7 @@
self.name = self.options[ 'name' ]
- self.handle = super(
+ self.handle = super(
DpctlCliDriver, self ).connect( user_name=self.user_name,
ip_address=self.ip_address,
port=None,
diff --git a/TestON/drivers/common/cli/toolsdriver.py b/TestON/drivers/common/cli/toolsdriver.py
index ec4585f..775902f 100644
--- a/TestON/drivers/common/cli/toolsdriver.py
+++ b/TestON/drivers/common/cli/toolsdriver.py
@@ -19,14 +19,6 @@
"""
-import pexpect
-import struct
-import fcntl
-import os
-import sys
-import signal
-import sys
-sys.path.append( "../" )
from drivers.common.clidriver import CLI
diff --git a/TestON/drivers/common/clidriver.py b/TestON/drivers/common/clidriver.py
index b4d0251..bac11a4 100644
--- a/TestON/drivers/common/clidriver.py
+++ b/TestON/drivers/common/clidriver.py
@@ -23,14 +23,7 @@
"""
import pexpect
-import struct
-import fcntl
-import os
-import sys
-import signal
-import sys
import re
-sys.path.append( "../" )
from drivers.component import Component
diff --git a/TestON/drivers/component.py b/TestON/drivers/component.py
index 9199a4e..b8a66e9 100644
--- a/TestON/drivers/component.py
+++ b/TestON/drivers/component.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-import logging
"""
Created on 24-Oct-2012
@@ -23,6 +22,8 @@
"""
+import logging
+
class Component( object ):