Changed copyMininetFile of onosdriver to scp function in clidriver
Change-Id: I52a11e7f97e727777e3ea891b453d4741fc32d1e
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 1d5322d..89a2611 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -49,6 +49,7 @@
super( Emulator, self ).__init__()
self.handle = self
self.name = None
+ self.home = None
self.wrapped = sys.modules[ __name__ ]
self.flag = 0
@@ -59,8 +60,14 @@
try:
for key in connectargs:
vars( self )[ key ] = connectargs[ key ]
-
+ self.home = "~/mininet"
self.name = self.options[ 'name' ]
+ for key in self.options:
+ if key == "home":
+ self.home = self.options[ 'home' ]
+ break
+ if self.home is None or self.home == "":
+ self.home = "~/mininet"
try:
if os.getenv( str( self.ip_address ) ) != None:
diff --git a/TestON/drivers/common/cli/emulator/poxclidriver.py b/TestON/drivers/common/cli/emulator/poxclidriver.py
index 39effc7..2d92139 100644
--- a/TestON/drivers/common/cli/emulator/poxclidriver.py
+++ b/TestON/drivers/common/cli/emulator/poxclidriver.py
@@ -57,15 +57,7 @@
self.name = self.options[ 'name' ]
poxLibPath = 'default'
- copy = super(
- PoxCliDriver,
- self ).secureCopy(
- self.user_name,
- self.ip_address,
- '/home/openflow/pox/pox/core.py',
- self.pwd,
- path +
- '/lib/pox/' )
+
self.handle = super(
PoxCliDriver,
self ).connect(
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index b6965d3..0bdb9b0 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1453,25 +1453,31 @@
main.cleanup()
main.exit()
- def runOnosTopoCfg( self, instanceName, jsonFile ):
+ def onosTopoCfg( self, onosIp, jsonFile ):
"""
- On ONOS bench, run this command:
- {ONOS_HOME}/tools/test/bin/onos-topo-cfg $OC1 filename
- which starts the rest and copies
- the json file to the onos instance
+ Description:
+ Execute onos-topo-cfg command
+ Required:
+ onosIp - IP of the onos node you want to send the json to
+ jsonFile - File path of the json file
+ Return:
+ Returns main.TRUE if the command is successfull; Returns
+ main.FALSE if there was an error
"""
try:
self.handle.sendline( "" )
self.handle.expect( "\$" )
- self.handle.sendline( "cd " + self.home + "/tools/test/bin" )
- self.handle.expect( "/bin$" )
- cmd = "./onos-topo-cfg " + instanceName + " " + jsonFile
- print "cmd = ", cmd
- self.handle.sendline( cmd )
- self.handle.expect( "\$" )
- self.handle.sendline( "cd ~" )
- self.handle.expect( "\$" )
- return main.TRUE
+ cmd = "onos-topo-cfg "
+ self.handle.sendline( cmd + str( onosIp ) + " " + jsonFile )
+ handle = self.handle.before
+ print handle
+ if "Error" in handle:
+ main.log.error( self.name + ": " + self.handle.before )
+ return main.FALSE
+ else:
+ self.handle.expect( "\$" )
+ return main.TRUE
+
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )