Fixed driver's cli function's arguments: userName and ipAddress -> user_name and ip_address
diff --git a/TestON/drivers/common/cli/emulator/lincoedriver.py b/TestON/drivers/common/cli/emulator/lincoedriver.py
index d275df0..8c5793f 100644
--- a/TestON/drivers/common/cli/emulator/lincoedriver.py
+++ b/TestON/drivers/common/cli/emulator/lincoedriver.py
@@ -53,8 +53,8 @@
self.name = self.options[ 'name' ]
self.handle = \
super( LincOEDriver, self ).connect(
- userName=self.userName,
- ipAddress=self.ipAddress,
+ user_name=self.user_name,
+ ip_address=self.ip_address,
port=None,
pwd=self.pwd )
@@ -73,7 +73,7 @@
else:
main.log.error( self.name +
": Connection failed to the host " +
- self.userName + "@" + self.ipAddress )
+ self.user_name + "@" + self.ip_address )
main.log.error( self.name +
": Failed to connect to Linc-OE" )
return main.FALSE
@@ -94,9 +94,9 @@
main.log.error(
self.name +
": Connection failed to the host " +
- self.userName +
+ self.user_name +
"@" +
- self.ipAddress )
+ self.ip_address )
main.log.error( self.name +
": Failed to connect to Linc-OE" )
return main.FALSE
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 41d65a6..95e0cb9 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -66,8 +66,8 @@
self.handle = super(
MininetCliDriver,
self ).connect(
- userName=self.userName,
- ipAddress=self.ipAddress,
+ user_name=self.user_name,
+ ip_address=self.ip_address,
port=None,
pwd=self.pwd )
@@ -148,9 +148,9 @@
main.log.error(
self.name +
": Connection failed to the host " +
- self.userName +
+ self.user_name +
"@" +
- self.ipAddress )
+ self.ip_address )
main.log.error( self.name + ": Failed to connect to the Mininet" )
return main.FALSE
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index f5982bf..e15e53c 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -44,7 +44,7 @@
self.flag = 0
def connect( self, **connectargs ):
- """,userName, ipAddress, pwd,options ):
+ """,user_name, ip_address, pwd,options ):
Here the main is the TestON instance after creating all the log
handles."""
for key in connectargs:
@@ -54,8 +54,8 @@
self.handle = super(
RemoteMininetDriver,
self ).connect(
- userName=self.userName,
- ipAddress=self.ipAddress,
+ user_name=self.user_name,
+ ip_address=self.ip_address,
port=None,
pwd=self.pwd )
@@ -68,9 +68,9 @@
else:
main.log.error(
"Connection failed to the host " +
- self.userName +
+ self.user_name +
"@" +
- self.ipAddress )
+ self.ip_address )
main.log.error( "Failed to connect to the Mininet" )
return main.FALSE