Using paramiko for all ssh & scp

By using paramiko, we can now also use differnt credentials to login into
the PROX instances. In the ssh section of the environment file, you can
now also add the password parameter.

Change-Id: I08d31cbf0d02d7e82b7fbe34268851f73ff5dde0
Signed-off-by: Luc Provoost <luc.provoost@intel.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
index f4c89ceb..e52b17db 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_generator_machine.py
@@ -17,7 +17,6 @@
 ##
 
 from rapid_log import RapidLog 
-from prox_ctrl import prox_ctrl
 from rapid_machine import RapidMachine
 from math import ceil, log2
 
@@ -49,8 +48,8 @@ class RapidGeneratorMachine(RapidMachine):
     """
     Class to deal with a generator PROX instance (VM, bare metal, container)
     """
-    def __init__(self, key, user, vim, rundir, resultsdir, machine_params,
-            configonly, ipv6):
+    def __init__(self, key, user, password, vim, rundir, resultsdir,
+            machine_params, configonly, ipv6):
         mac_address_size = 6
         ethertype_size = 2
         FCS_size = 4
@@ -78,8 +77,8 @@ class RapidGeneratorMachine(RapidMachine):
             self.bucket_size_exp = machine_params['bucket_size_exp']
         else:
             self.bucket_size_exp = 11
-        super().__init__(key, user, vim, rundir, resultsdir, machine_params,
-                configonly)
+        super().__init__(key, user, password, vim, rundir, resultsdir,
+                machine_params, configonly)
 
     def get_cores(self):
         return (self.machine_params['gencores'] +