Merge branch 'master' of https://github.com/opennetworkinglab/ONLabTest
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
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index abe064f..9f08e06 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -47,8 +47,8 @@
self.name = self.options[ 'name' ]
self.handle = super( OnosCliDriver, self ).connect(
- userName=self.userName,
- ipAddress=self.ipAddress,
+ user_name=self.user_name,
+ ip_address=self.ip_address,
port=self.port,
pwd=self.pwd,
home=self.home )
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index c92a608..1a7c7d5 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -48,8 +48,8 @@
self.name = self.options[ 'name' ]
self.handle = super( OnosDriver, self ).connect(
- userName=self.userName,
- ipAddress=self.ipAddress,
+ user_name=self.user_name,
+ ip_address=self.ip_address,
port=self.port,
pwd=self.pwd,
home=self.home )
diff --git a/TestON/drivers/common/cli/quaggaclidriver.py b/TestON/drivers/common/cli/quaggaclidriver.py
index f0cfecc..8724454 100644
--- a/TestON/drivers/common/cli/quaggaclidriver.py
+++ b/TestON/drivers/common/cli/quaggaclidriver.py
@@ -26,19 +26,19 @@
self.name = self.options[ 'name' ]
# self.handle = super( QuaggaCliDriver,self ).connect(
- # userName=self.userName, ipAddress=self.ipAddress,port=self.port,
+ # user_name=self.user_name, ip_address=self.ip_address,port=self.port,
# pwd=self.pwd )
self.handle = super(
QuaggaCliDriver,
self ).connect(
- userName=self.userName,
- ipAddress="1.1.1.1",
+ user_name=self.user_name,
+ ip_address="1.1.1.1",
port=self.port,
pwd=self.pwd )
main.log.info(
"connect parameters:" + str(
- self.userName ) + ";" + str(
- self.ipAddress ) + ";" + str(
+ self.user_name ) + ";" + str(
+ self.ip_address ) + ";" + str(
self.port ) + ";" + str(
self.pwd ) )
@@ -59,15 +59,15 @@
main.log.info( "NO HANDLE" )
return main.FALSE
- def loginQuagga( self, ipAddress ):
+ def loginQuagga( self, ip_address ):
self.name = self.options[ 'name' ]
self.handle = super( QuaggaCliDriver, self ).connect(
- userName=self.userName, ipAddress=ipAddress,
+ user_name=self.user_name, ip_address=ip_address,
port=self.port, pwd=self.pwd )
main.log.info( "connect parameters:" +
- str( self.userName ) +
+ str( self.user_name ) +
";" +
- str( self.ipAddress ) +
+ str( self.ip_address ) +
";" +
str( self.port ) +
";" +
@@ -85,7 +85,7 @@
self.handle.sendline( "enable" )
# self.handle.expect( "bgpd#", timeout=5 )
self.handle.expect( "bgpd#" )
- main.log.info( "I in quagga on host " + str( ipAddress ) )
+ main.log.info( "I in quagga on host " + str( ip_address ) )
return self.handle
else:
@@ -154,7 +154,7 @@
ingress = []
egress = ""
for peer in sdnipData[ 'bgpPeers' ]:
- if peer[ 'ipAddress' ] == nextHop:
+ if peer[ 'ip_address' ] == nextHop:
egress = "of:" + \
str( peer[ 'attachmentDpid' ] ).replace( ":", "" ) + ":" +\
str( peer[ 'attachmentPort' ] )
@@ -302,7 +302,7 @@
peer[ 'attachmentDpid' ] ) and eq(
interfaceAddress[ 'interfacePort' ],
peer[ 'attachmentPort' ] ):
- bgpSpeakerIpAddress = interfaceAddress[ 'ipAddress' ]
+ bgpSpeakerIpAddress = interfaceAddress[ 'ip_address' ]
break
else:
continue
@@ -310,7 +310,7 @@
# from bgpSpeakerAttachmentPoint to bgpPeerAttachmentPoint
# direction
selectorStr = "IPV4_SRC{ip=" + bgpSpeakerIpAddress +\
- "/32}," + "IPV4_DST{ip=" + peer[ 'ipAddress' ] + "/32}," +\
+ "/32}," + "IPV4_DST{ip=" + peer[ 'ip_address' ] + "/32}," +\
"IP_PROTO{protocol=6}, ETH_TYPE{ethType=800},\
TCP_DST{tcpPort=179}"
selector = selectorStr.replace( " ", "" ).replace(
@@ -320,7 +320,7 @@
intents.append( intent )
selectorStr = "IPV4_SRC{ip=" + bgpSpeakerIpAddress + "/32}," +\
- "IPV4_DST{ip=" + peer[ 'ipAddress' ] + "/32}," +\
+ "IPV4_DST{ip=" + peer[ 'ip_address' ] + "/32}," +\
"IP_PROTO{protocol=6}, ETH_TYPE{ethType=800},\
TCP_SRC{tcpPort=179}"
selector = selectorStr.replace( " ", "" ).replace(
@@ -331,7 +331,7 @@
# from bgpPeerAttachmentPoint to bgpSpeakerAttachmentPoint
# direction
- selectorStr = "IPV4_SRC{ip=" + peer[ 'ipAddress' ] + "/32}," +\
+ selectorStr = "IPV4_SRC{ip=" + peer[ 'ip_address' ] + "/32}," +\
"IPV4_DST{ip=" + bgpSpeakerIpAddress + "/32}," + \
"IP_PROTO{protocol=6}, ETH_TYPE{ethType=800},\
TCP_DST{tcpPort=179}"
@@ -341,7 +341,7 @@
bgpSpeakerAttachmentPoint + "/" + str( sorted( selector ) )
intents.append( intent )
- selectorStr = "IPV4_SRC{ip=" + peer[ 'ipAddress' ] + "/32}," +\
+ selectorStr = "IPV4_SRC{ip=" + peer[ 'ip_address' ] + "/32}," +\
"IPV4_DST{ip=" + bgpSpeakerIpAddress + "/32}," +\
"IP_PROTO{protocol=6}, ETH_TYPE{ethType=800},\
TCP_SRC{tcpPort=179}"
@@ -409,17 +409,17 @@
return main.TRUE
return main.FALSE
- def pingTest( self, ipAddress, pingTestFile, pingTestResultFile ):
- main.log.info( "Start the ping test on host:" + str( ipAddress ) )
+ def pingTest( self, ip_address, pingTestFile, pingTestResultFile ):
+ main.log.info( "Start the ping test on host:" + str( ip_address ) )
self.name = self.options[ 'name' ]
self.handle = super( QuaggaCliDriver, self ).connect(
- userName=self.userName, ipAddress=ipAddress,
+ user_name=self.user_name, ip_address=ip_address,
port=self.port, pwd=self.pwd )
main.log.info( "connect parameters:" +
- str( self.userName ) +
+ str( self.user_name ) +
";" +
- str( self.ipAddress ) +
+ str( self.ip_address ) +
";" +
str( self.port ) +
";" +
@@ -428,7 +428,7 @@
if self.handle:
# self.handle.expect( "" )
# self.handle.expect( "\$" )
- main.log.info( "I in host " + str( ipAddress ) )
+ main.log.info( "I in host " + str( ip_address ) )
main.log.info(
pingTestFile +
" > " +