You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/11/20 12:23:31 UTC
[1/2] git commit: Use super instead of NodeDriver.__init__.
Updated Branches:
refs/heads/trunk 7e5f2b3cb -> 5fc50730b
Use super instead of NodeDriver.__init__.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/c4e4ae2f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c4e4ae2f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c4e4ae2f
Branch: refs/heads/trunk
Commit: c4e4ae2f536ae3ef22ed2c767d05c7c12afdbfd6
Parents: 7e5f2b3
Author: Tomaz Muraus <to...@apache.org>
Authored: Wed Nov 20 12:04:16 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Wed Nov 20 12:04:16 2013 +0100
----------------------------------------------------------------------
libcloud/compute/drivers/cloudstack.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/c4e4ae2f/libcloud/compute/drivers/cloudstack.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/cloudstack.py b/libcloud/compute/drivers/cloudstack.py
index 6870bf9..6b3f962 100644
--- a/libcloud/compute/drivers/cloudstack.py
+++ b/libcloud/compute/drivers/cloudstack.py
@@ -251,8 +251,11 @@ class CloudStackNodeDriver(CloudStackDriverMixIn, NodeDriver):
'you also need to provide url or host and path '
'argument')
- NodeDriver.__init__(self, key=key, secret=secret, secure=secure,
- host=host, port=port)
+ super(CloudStackNodeDriver, self).__init__(key=key,
+ secret=secret,
+ secure=secure,
+ host=host,
+ port=port)
def list_images(self, location=None):
args = {
[2/2] git commit: Modify _create_args_to_params method in the
CloudStack driver to be more robust and handle "None" values better.
Posted by to...@apache.org.
Modify _create_args_to_params method in the CloudStack driver to be more robust
and handle "None" values better.
Part of LIBCLOUD-441.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5fc50730
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5fc50730
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5fc50730
Branch: refs/heads/trunk
Commit: 5fc50730be29a9e70be245f0f30310ef80f5474f
Parents: c4e4ae2
Author: Tomaz Muraus <to...@apache.org>
Authored: Wed Nov 20 12:14:49 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Wed Nov 20 12:21:12 2013 +0100
----------------------------------------------------------------------
libcloud/compute/drivers/cloudstack.py | 57 +++++++++++++++++------------
1 file changed, 33 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/5fc50730/libcloud/compute/drivers/cloudstack.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/cloudstack.py b/libcloud/compute/drivers/cloudstack.py
index 6b3f962..b5d14e4 100644
--- a/libcloud/compute/drivers/cloudstack.py
+++ b/libcloud/compute/drivers/cloudstack.py
@@ -462,36 +462,45 @@ class CloudStackNodeDriver(CloudStackDriverMixIn, NodeDriver):
'name': kwargs.get('name'),
}
- if 'name' in kwargs:
- server_params['displayname'] = kwargs.get('name')
-
- if 'size' in kwargs:
- server_params['serviceofferingid'] = kwargs.get('size').id
-
- if 'image' in kwargs:
- server_params['templateid'] = kwargs.get('image').id
-
- if 'location' in kwargs:
- server_params['zoneid'] = kwargs.get('location').id
+ # TODO: Refactor and use "kwarg_to_server_params" map
+ name = kwargs.get('name', None)
+ size = kwargs.get('size', None)
+ image = kwargs.get('image', None)
+ location = kwargs.get('location', None)
+ networks = kwargs.get('networks', None)
+ ex_key_name = kwargs.get('ex_keyname', None)
+ ex_user_data = kwargs.get('ex_userdata', None)
+ ex_security_groups = kwargs.get('ex_security_groups', None)
+
+ if name:
+ server_params['name'] = name
+
+ if size:
+ server_params['serviceofferingid'] = size.id
+
+ if image:
+ server_params['templateid'] = image.id
+
+ if location:
+ server_params['zoneid'] = location.id
else:
+ # Use a default location
server_params['zoneid'] = self.list_locations()[0].id
- if 'ex_keyname' in kwargs:
- server_params['keypair'] = kwargs['ex_keyname']
-
- if 'ex_userdata' in kwargs:
- server_params['userdata'] = base64.b64encode(
- b(kwargs['ex_userdata'])).decode('ascii')
-
- if 'networks' in kwargs:
- networks = kwargs['networks']
+ if networks:
networks = ','.join([network.id for network in networks])
server_params['networkids'] = networks
- if 'ex_security_groups' in kwargs:
- security_groups = kwargs['ex_security_groups']
- security_groups = ','.join(security_groups)
- server_params['securitygroupnames'] = security_groups
+ if ex_key_name:
+ server_params['keypair'] = ex_key_name
+
+ if ex_user_data:
+ ex_user_data = base64.b64encode(b(ex_user_data).decode('ascii'))
+ server_params['userdata'] = ex_user_data
+
+ if ex_security_groups:
+ ex_security_groups = ','.join(ex_security_groups)
+ server_params['securitygroupnames'] = ex_security_groups
return server_params