Adding -o option to unzip odl steps in the deploy.py script,

[integration/test.git] / tools / clustering / cluster-deployer / deploy.py

diff --git a/tools/clustering/cluster-deployer/deploy.py b/tools/clustering/cluster-deployer/deploy.py
index a948a1bc0b7cbc4f8456724d51408cc93234679b..6de9feabe00314038ef27471344d8553de379a93 100755 (executable)
--- a/tools/clustering/cluster-deployer/deploy.py
+++ b/tools/clustering/cluster-deployer/deploy.py
@@ -140,7 +140,7 @@ class Deployer:
                                  self.rootdir)
 
     def kill_controller(self):
-        self.remote.copy_file("kill_controller.sh",  self.rootdir + "/")
+        self.remote.copy_file("kill_controller.sh", self.rootdir + "/")
         self.remote.exec_cmd(self.rootdir + "/kill_controller.sh")
 
     def deploy(self):
@@ -204,7 +204,7 @@ class Deployer:
         # Copy the distribution to the host and unzip it
         odl_file_path = self.dir_name + "/odl.zip"
         self.remote.copy_file(self.distribution, odl_file_path)
-        self.remote.exec_cmd("unzip " + odl_file_path + " -d " +
+        self.remote.exec_cmd("unzip -o " + odl_file_path + " -d " +
                              self.dir_name + "/")
 
         # Rename the distribution directory to odl
@@ -266,10 +266,10 @@ def main():
 
     for x in range(0, 10):
         if len(all_replicas) > args.rf:
-            replicas["REPLICAS_" + str(x+1)] \
+            replicas["REPLICAS_" + str(x + 1)] \
                 = array_str(random.sample(all_replicas, args.rf))
         else:
-            replicas["REPLICAS_" + str(x+1)] = array_str(all_replicas)
+            replicas["REPLICAS_" + str(x + 1)] = array_str(all_replicas)
 
     deployers = []