[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/drivers/common/api/controller/onosrestdriver.py b/TestON/drivers/common/api/controller/onosrestdriver.py
index d5c1114..bfe49f1 100755
--- a/TestON/drivers/common/api/controller/onosrestdriver.py
+++ b/TestON/drivers/common/api/controller/onosrestdriver.py
@@ -35,7 +35,7 @@
def __init__( self ):
self.pwd = None
self.user_name = "user"
- super( Controller, self ).__init__()
+ super( OnosRestDriver, self ).__init__()
self.ip_address = "localhost"
self.port = "8080"
self.wrapped = sys.modules[ __name__ ]
diff --git a/TestON/drivers/common/api/controllerdriver.py b/TestON/drivers/common/api/controllerdriver.py
index 6cda814..721e7e0 100644
--- a/TestON/drivers/common/api/controllerdriver.py
+++ b/TestON/drivers/common/api/controllerdriver.py
@@ -31,5 +31,5 @@
# The common functions for emulator included in emulatordriver
def __init__( self ):
- super( API, self ).__init__()
+ super( Controller, self ).__init__()
diff --git a/TestON/drivers/common/api/dockerapidriver.py b/TestON/drivers/common/api/dockerapidriver.py
index 21e2024..6d9650c 100644
--- a/TestON/drivers/common/api/dockerapidriver.py
+++ b/TestON/drivers/common/api/dockerapidriver.py
@@ -24,7 +24,7 @@
self.name = None
self.home = None
self.handle = None
- super( API, self ).__init__()
+ super( DockerApiDriver, self ).__init__()
def connect( self, **connectargs ):
"""
diff --git a/TestON/drivers/common/api/fvtapidriver.py b/TestON/drivers/common/api/fvtapidriver.py
index f861f7d..1a71655 100644
--- a/TestON/drivers/common/api/fvtapidriver.py
+++ b/TestON/drivers/common/api/fvtapidriver.py
@@ -98,7 +98,7 @@
class FvtApiDriver( API, templatetest.TemplateTest ):
def __init__( self ):
- super( API, self ).__init__()
+ super( FvtApiDriver, self ).__init__()
print 'init'
def connect( self, **connectargs ):