From cdc3e672e7a57b9f17ed73f2e9465dfc6e84d58a Mon Sep 17 00:00:00 2001 From: Ganesh Jagtap Date: Fri, 12 Jan 2018 14:14:17 +0530 Subject: [PATCH 1/3] Added suport to extra parameter suport to create() Docker-machine create() added one more list parameter, it will suport vmwarevsphere create. --- machine/machine.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/machine/machine.py b/machine/machine.py index a0c56e1..58f5c3c 100644 --- a/machine/machine.py +++ b/machine/machine.py @@ -86,7 +86,7 @@ def version(self): match = self._match(cmd, regexp) return match.group(1) - def create(self, name, driver='virtualbox', blocking=True): + def create(self, name, driver='virtualbox', blocking=True, xarg=[]): """ Create a docker machine using the provided name and driver NOTE: This takes a loooooong time @@ -100,6 +100,7 @@ def create(self, name, driver='virtualbox', blocking=True): int: error code from the run """ cmd = ['create', '--driver', driver, name] + cmd = cmd + xarg if blocking: stdout, stderr, errorcode = self._run_blocking(cmd) else: From d1b3b9e9c588197bd098d47082a73fad4655582e Mon Sep 17 00:00:00 2001 From: sumitkapoor Date: Wed, 24 Jan 2018 14:31:15 +0530 Subject: [PATCH 2/3] - Argumenst passed to docker-machine just be added before specifying the VM name. --- machine/machine.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/machine/machine.py b/machine/machine.py index 58f5c3c..64b0a3f 100644 --- a/machine/machine.py +++ b/machine/machine.py @@ -99,8 +99,10 @@ def create(self, name, driver='virtualbox', blocking=True, xarg=[]): Returns: int: error code from the run """ - cmd = ['create', '--driver', driver, name] + cmd = ['create', '--driver', driver] cmd = cmd + xarg + cmd.append(name) + if blocking: stdout, stderr, errorcode = self._run_blocking(cmd) else: From 757ddc2b2112069669fcd2b33818ae1e48fc59dc Mon Sep 17 00:00:00 2001 From: Ganesh Jagtap Date: Thu, 25 Jan 2018 13:33:25 +0530 Subject: [PATCH 3/3] Xarg createVM : Removed Mutable Default Arguments 1) Removed Mutable Default Arguments 2) cmd argument list merge modified. --- machine/machine.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/machine/machine.py b/machine/machine.py index 64b0a3f..14e0245 100644 --- a/machine/machine.py +++ b/machine/machine.py @@ -86,7 +86,7 @@ def version(self): match = self._match(cmd, regexp) return match.group(1) - def create(self, name, driver='virtualbox', blocking=True, xarg=[]): + def create(self, name, driver='virtualbox', blocking=True, xarg=None): """ Create a docker machine using the provided name and driver NOTE: This takes a loooooong time @@ -99,9 +99,9 @@ def create(self, name, driver='virtualbox', blocking=True, xarg=[]): Returns: int: error code from the run """ - cmd = ['create', '--driver', driver] - cmd = cmd + xarg - cmd.append(name) + if xarg is None: + xarg = [] + cmd = ['create', '--driver', driver] + xarg + [name] if blocking: stdout, stderr, errorcode = self._run_blocking(cmd)