From ea587bcc29128652a98b0a7c1327dd3336f4f484 Mon Sep 17 00:00:00 2001 From: Pete Vander Giessen Date: Mon, 28 Nov 2016 14:57:14 -0500 Subject: [PATCH] Addressed comments in PR. --- juju/constraints.py | 2 +- juju/model.py | 30 ++++++++++++++---------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/juju/constraints.py b/juju/constraints.py index d713774..43a80a3 100644 --- a/juju/constraints.py +++ b/juju/constraints.py @@ -1,5 +1,5 @@ # -# Library to parse constraints +# Module that parses constraints # # The current version of juju core expects the client to take # constraints given in the form "mem=10G foo=bar" and parse them into diff --git a/juju/model.py b/juju/model.py index e412784..0922520 100644 --- a/juju/model.py +++ b/juju/model.py @@ -1258,22 +1258,20 @@ class BundleHandler(object): async def addMachines(self, params): """ - :param series string: - Series holds the optional machine OS series. - - :param constraints string: - Constraints holds the optional machine constraints. - - :param Container_type string: - ContainerType optionally holds the type of the container (for - instance ""lxc" or kvm"). It is not specified for top level - machines. - - :param parent_id string: - ParentId optionally holds a placeholder pointing to another machine - change or to a unit change. This value is only specified in the - case this machine is a container, in which case also ContainerType - is set. + :param params dict: + Dictionary specifying the machine to add. Keys include: + + series: string specifying the machine OS series. + constraints: string holding optional machine constraints. We'll + parse this into the json friendly dict that the juju api + expects. + Container_type: string holding the type of the container (for + instance ""lxc" or kvm"). It is not specified for top level + machines. + parent_id: string holding a placeholder pointing to another + machine change or to a unit change. This value is only + specified in the case this machine is a container, in + which case also ContainerType is set. """ if 'parent_id' in params: params['parent_id'] = self.resolve(params['parent_id']) -- 2.25.1