From 053d02b67c8a715b4fe7b5deee5ef9e02f28c4a7 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Mon, 28 Sep 2015 11:37:34 +0300 Subject: [PATCH] Added volume_mount_prefix for node group templates Added ability to create and update node group template with volume_mount_prefix parameter Change-Id: I6e0bcdc21af2101ac9cff4a627149688f149b387 Closes-bug: #1499697 --- saharaclient/api/node_group_templates.py | 11 ++++++++--- saharaclient/tests/unit/test_node_group_templates.py | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/saharaclient/api/node_group_templates.py b/saharaclient/api/node_group_templates.py index e936b958..84d278c1 100644 --- a/saharaclient/api/node_group_templates.py +++ b/saharaclient/api/node_group_templates.py @@ -30,7 +30,8 @@ class NodeGroupTemplateManager(base.ResourceManager): availability_zone=None, volumes_availability_zone=None, volume_type=None, image_id=None, is_proxy_gateway=None, volume_local_to_instance=None, use_autoconfig=None, - shares=None, is_public=None, is_protected=None): + shares=None, is_public=None, is_protected=None, + volume_mount_prefix=None): data = { 'name': name, @@ -66,6 +67,8 @@ class NodeGroupTemplateManager(base.ResourceManager): if volume_local_to_instance: data.update( {"volume_local_to_instance": volume_local_to_instance}) + if volume_mount_prefix: + data.update({"volume_mount_prefix": volume_mount_prefix}) return self._create('/node-group-templates', data, 'node_group_template') @@ -78,7 +81,8 @@ class NodeGroupTemplateManager(base.ResourceManager): volumes_availability_zone=None, volume_type=None, image_id=None, is_proxy_gateway=None, volume_local_to_instance=None, use_autoconfig=None, - shares=None, is_public=None, is_protected=None): + shares=None, is_public=None, is_protected=None, + volume_mount_prefix=None): data = {} self._copy_if_defined( @@ -95,7 +99,8 @@ class NodeGroupTemplateManager(base.ResourceManager): is_proxy_gateway=is_proxy_gateway, volume_local_to_instance=volume_local_to_instance, use_autoconfig=use_autoconfig, shares=shares, - is_public=is_public, is_protected=is_protected + is_public=is_public, is_protected=is_protected, + volume_mount_prefix=volume_mount_prefix ) return self._update('/node-group-templates/%s' % ng_template_id, data, diff --git a/saharaclient/tests/unit/test_node_group_templates.py b/saharaclient/tests/unit/test_node_group_templates.py index a0b7d679..f7ca1fcb 100644 --- a/saharaclient/tests/unit/test_node_group_templates.py +++ b/saharaclient/tests/unit/test_node_group_templates.py @@ -29,6 +29,7 @@ class NodeGroupTemplateTest(base.BaseTestCase): "volumes_size": "4", "node_processes": ["datanode"], "use_autoconfig": True, + "volume_mount_prefix": '/volumes/disk', } update_json = { @@ -42,6 +43,7 @@ class NodeGroupTemplateTest(base.BaseTestCase): "volumes_size": "4", "node_processes": ["datanode", "namenode"], "use_autoconfig": False, + "volume_mount_prefix": '/volumes/newdisk', } }