diff options
| -rw-r--r-- | savannaclient/api/cluster_templates.py | 19 | ||||
| -rw-r--r-- | savannaclient/api/node_group_templates.py | 10 |
2 files changed, 14 insertions, 15 deletions
diff --git a/savannaclient/api/cluster_templates.py b/savannaclient/api/cluster_templates.py index dcf73b0..feef595 100644 --- a/savannaclient/api/cluster_templates.py +++ b/savannaclient/api/cluster_templates.py @@ -25,20 +25,21 @@ class ClusterTemplate(base.Resource): class ClusterTemplateManager(base.ResourceManager): resource_class = ClusterTemplate - def create(self, name, plugin_name, hadoop_version, description, - cluster_configs, node_groups, anti_affinity, net_id=None): + def create(self, name, plugin_name, hadoop_version, description=None, + cluster_configs=None, node_groups=None, anti_affinity=None, + net_id=None): data = { 'name': name, 'plugin_name': plugin_name, - 'hadoop_version': hadoop_version, - 'description': description, - 'cluster_configs': cluster_configs, - 'node_groups': node_groups, - 'anti_affinity': anti_affinity + 'hadoop_version': hadoop_version } - if net_id: - data.update({'neutron_management_network': net_id}) + self._copy_if_defined(data, + description=description, + cluster_configs=cluster_configs, + node_groups=node_groups, + anti_affinity=anti_affinity, + neutron_management_network=net_id) return self._create('/cluster-templates', data, 'cluster_template') diff --git a/savannaclient/api/node_group_templates.py b/savannaclient/api/node_group_templates.py index f3c1036..b8585a0 100644 --- a/savannaclient/api/node_group_templates.py +++ b/savannaclient/api/node_group_templates.py @@ -33,16 +33,14 @@ class NodeGroupTemplateManager(base.ResourceManager): 'name': name, 'plugin_name': plugin_name, 'hadoop_version': hadoop_version, - 'description': description, 'flavor_id': flavor_id, 'node_processes': node_processes } - if not node_configs: - data["node_configs"] = dict() - - if floating_ip_pool: - data.update({"floating_ip_pool": floating_ip_pool}) + self._copy_if_defined(data, + description=description, + node_configs=node_configs, + floating_ip_pool=floating_ip_pool) if volumes_per_node: data.update({"volumes_per_node": volumes_per_node, |