Merge "Add support of use_autoconfig field"

3 files changed, 21 insertions, 14 deletions

diff --git a/saharaclient/api/cluster_templates.py b/saharaclient/api/cluster_templates.py
index 44f4bc5..018939c 100644
--- a/saharaclient/api/cluster_templates.py
+++ b/saharaclient/api/cluster_templates.py
@@ -25,7 +25,8 @@ class ClusterTemplateManager(base.ResourceManager):
 
     def _assign_field(self, name, plugin_name, hadoop_version,
                       description=None, cluster_configs=None, node_groups=None,
-                      anti_affinity=None, net_id=None, default_image_id=None):
+                      anti_affinity=None, net_id=None, default_image_id=None,
+                      use_autoconfig=None):
         data = {
             'name': name,
             'plugin_name': plugin_name,
@@ -38,24 +39,28 @@ class ClusterTemplateManager(base.ResourceManager):
                               node_groups=node_groups,
                               anti_affinity=anti_affinity,
                               neutron_management_network=net_id,
-                              default_image_id=default_image_id)
+                              default_image_id=default_image_id,
+                              use_autoconfig=use_autoconfig)
         return data
 
     def create(self, name, plugin_name, hadoop_version, description=None,
                cluster_configs=None, node_groups=None, anti_affinity=None,
-               net_id=None, default_image_id=None):
+               net_id=None, default_image_id=None, use_autoconfig=None):
         data = self._assign_field(name, plugin_name, hadoop_version,
                                   description, cluster_configs, node_groups,
-                                  anti_affinity, net_id, default_image_id)
+                                  anti_affinity, net_id, default_image_id,
+                                  use_autoconfig)
 
         return self._create('/cluster-templates', data, 'cluster_template')
 
     def update(self, cluster_template_id, name, plugin_name, hadoop_version,
                description=None, cluster_configs=None, node_groups=None,
-               anti_affinity=None, net_id=None, default_image_id=None):
+               anti_affinity=None, net_id=None, default_image_id=None,
+               use_autoconfig=None):
         data = self._assign_field(name, plugin_name, hadoop_version,
                                   description, cluster_configs, node_groups,
-                                  anti_affinity, net_id, default_image_id)
+                                  anti_affinity, net_id, default_image_id,
+                                  use_autoconfig)
 
         return self._update('/cluster-templates/%s' % cluster_template_id,
                             data, 'cluster_template')
diff --git a/saharaclient/api/clusters.py b/saharaclient/api/clusters.py
index 130143d..2503063 100644
--- a/saharaclient/api/clusters.py
+++ b/saharaclient/api/clusters.py
@@ -29,7 +29,8 @@ class ClusterManager(base.ResourceManager):
                cluster_template_id=None, default_image_id=None,
                is_transient=None, description=None, cluster_configs=None,
                node_groups=None, user_keypair_id=None,
-               anti_affinity=None, net_id=None, count=None):
+               anti_affinity=None, net_id=None, count=None,
+               use_autoconfig=None):
 
         data = {
             'name': name,
@@ -53,7 +54,7 @@ class ClusterManager(base.ResourceManager):
                               user_keypair_id=user_keypair_id,
                               anti_affinity=anti_affinity,
                               neutron_management_network=net_id,
-                              count=count)
+                              count=count, use_autoconfig=use_autoconfig)
 
         if count:
             return self._create('/clusters/multiple', data)
diff --git a/saharaclient/api/node_group_templates.py b/saharaclient/api/node_group_templates.py
index 72e9d60..49ad6d2 100644
--- a/saharaclient/api/node_group_templates.py
+++ b/saharaclient/api/node_group_templates.py
@@ -30,7 +30,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
                       security_groups=None, auto_security_group=None,
                       availability_zone=None, volumes_availability_zone=None,
                       volume_type=None, image_id=None, is_proxy_gateway=None,
-                      volume_local_to_instance=None):
+                      volume_local_to_instance=None, use_autoconfig=None):
 
         data = {
             'name': name,
@@ -48,7 +48,8 @@ class NodeGroupTemplateManager(base.ResourceManager):
                               auto_security_group=auto_security_group,
                               availability_zone=availability_zone,
                               image_id=image_id,
-                              is_proxy_gateway=is_proxy_gateway
+                              is_proxy_gateway=is_proxy_gateway,
+                              use_autoconfig=use_autoconfig
                               )
 
         if volumes_per_node:
@@ -71,7 +72,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
                security_groups=None, auto_security_group=None,
                availability_zone=None, volumes_availability_zone=None,
                volume_type=None, image_id=None, is_proxy_gateway=None,
-               volume_local_to_instance=None):
+               volume_local_to_instance=None, use_autoconfig=None):
 
         data = self._assign_field(name, plugin_name, hadoop_version, flavor_id,
                                   description, volumes_per_node, volumes_size,
@@ -80,7 +81,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
                                   auto_security_group, availability_zone,
                                   volumes_availability_zone, volume_type,
                                   image_id, is_proxy_gateway,
-                                  volume_local_to_instance)
+                                  volume_local_to_instance, use_autoconfig)
 
         return self._create('/node-group-templates', data,
                             'node_group_template')
@@ -92,7 +93,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
                auto_security_group=None, availability_zone=None,
                volumes_availability_zone=None, volume_type=None,
                image_id=None, is_proxy_gateway=None,
-               volume_local_to_instance=None):
+               volume_local_to_instance=None, use_autoconfig=None):
 
         data = self._assign_field(name, plugin_name, hadoop_version, flavor_id,
                                   description, volumes_per_node, volumes_size,
@@ -101,7 +102,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
                                   auto_security_group, availability_zone,
                                   volumes_availability_zone, volume_type,
                                   image_id, is_proxy_gateway,
-                                  volume_local_to_instance)
+                                  volume_local_to_instance, use_autoconfig)
 
         return self._update('/node-group-templates/%s' % ng_template_id, data,
                             'node_group_template')