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(