openstack/python-saharaclient
Code Issues Proposed changes

Merge "Support Cinder availability zones"

Browse Source
This commit is contained in:
Jenkins
2014-10-16 12:11:31 +00:00
committed by Gerrit Code Review
parent e9f953fc84 b43dc219b1
commit 7fa1eadaba
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/api.rst
View File

@@ -133,7 +133,7 @@ Image Registry ops
Node Group Template ops
~~~~~~~~~~~~~~~~~~~~~~~
* create(name, plugin_name, hadoop_version, flavor_id, description, volumes_per_node, volumes_size, node_processes, node_configs, floating_ip_pool, availability_zone) - Create a Node Group Template with specified parameters.
* create(name, plugin_name, hadoop_version, flavor_id, description, volumes_per_node, volumes_size, node_processes, node_configs, floating_ip_pool, availability_zone, volumes_availability_zone) - Create a Node Group Template with specified parameters.
Cluster Template ops
~~~~~~~~~~~~~~~~~~~~

36
saharaclient/api/node_group_templates.py
View File

@@ -24,11 +24,11 @@ class NodeGroupTemplateManager(base.ResourceManager):
resource_class = NodeGroupTemplate
def _assign_field(self, name, plugin_name, hadoop_version, flavor_id,
description=None,
volumes_per_node=None, volumes_size=None,
node_processes=None, node_configs=None,
floating_ip_pool=None, security_groups=None,
auto_security_group=None, availability_zone=None):
description=None, volumes_per_node=None,
volumes_size=None, node_processes=None,
node_configs=None, floating_ip_pool=None,
security_groups=None, auto_security_group=None,
availability_zone=None, volumes_availability_zone=None):
data = {
'name': name,
@@ -50,6 +50,9 @@ class NodeGroupTemplateManager(base.ResourceManager):
if volumes_per_node:
data.update({"volumes_per_node": volumes_per_node,
"volumes_size": volumes_size})
if volumes_availability_zone:
data.update({"volumes_availability_zone":
volumes_availability_zone})
return data
@@ -57,30 +60,31 @@ class NodeGroupTemplateManager(base.ResourceManager):
description=None, volumes_per_node=None, volumes_size=None,
node_processes=None, node_configs=None, floating_ip_pool=None,
security_groups=None, auto_security_group=None,
availability_zone=None):
availability_zone=None, volumes_availability_zone=None):
data = self._assign_field(name, plugin_name, hadoop_version, flavor_id,
description, volumes_per_node, volumes_size,
node_processes, node_configs,
floating_ip_pool, security_groups,
auto_security_group, availability_zone)
auto_security_group, availability_zone,
volumes_availability_zone)
return self._create('/node-group-templates', data,
'node_group_template')
def update(self, ng_template_id, name, plugin_name, hadoop_version,
flavor_id, description=None, volumes_per_node=None,
volumes_size=None, node_processes=None,
node_configs=None, floating_ip_pool=None,
security_groups=None, auto_security_group=None,
availability_zone=None):
volumes_size=None, node_processes=None, node_configs=None,
floating_ip_pool=None, security_groups=None,
auto_security_group=None, availability_zone=None,
volumes_availability_zone=None):
data = self._assign_field(name, plugin_name, hadoop_version, flavor_id,
description, volumes_per_node,
volumes_size, node_processes,
node_configs, floating_ip_pool,
security_groups, auto_security_group,
availability_zone)
description, volumes_per_node, volumes_size,
node_processes, node_configs,
floating_ip_pool, security_groups,
auto_security_group, availability_zone,
volumes_availability_zone)
return self._update('/node-group-templates/%s' % ng_template_id, data,
'node_group_template')