Merge "Remove resetting self.flavor_id in CDH test"
This commit is contained in:
commit
1add54194f
|
@ -172,10 +172,13 @@ class ITestCase(testcase.WithAttributes, base.BaseTestCase):
|
|||
def create_node_group_template(self, name, plugin_config, description,
|
||||
node_processes, node_configs,
|
||||
volumes_per_node=0, volumes_size=0,
|
||||
floating_ip_pool=None, **kwargs):
|
||||
floating_ip_pool=None, flavor_id=None,
|
||||
**kwargs):
|
||||
if not flavor_id:
|
||||
flavor_id = self.flavor_id
|
||||
data = self.sahara.node_group_templates.create(
|
||||
name, plugin_config.PLUGIN_NAME, plugin_config.HADOOP_VERSION,
|
||||
self.flavor_id, description, volumes_per_node, volumes_size,
|
||||
flavor_id, description, volumes_per_node, volumes_size,
|
||||
node_processes, node_configs, floating_ip_pool, **kwargs)
|
||||
node_group_template_id = data.id
|
||||
return node_group_template_id
|
||||
|
|
|
@ -45,7 +45,6 @@ class CDHGatingTest(check_services.CheckServicesTest,
|
|||
self.cluster_id = None
|
||||
self.cluster_template_id = None
|
||||
self.services_cluster_template_id = None
|
||||
self.flavor_id = self.plugin_config.LARGE_FLAVOR
|
||||
|
||||
def get_plugin_config(self):
|
||||
return cfg.ITConfig().cdh_config
|
||||
|
@ -59,7 +58,8 @@ class CDHGatingTest(check_services.CheckServicesTest,
|
|||
'node_processes': ['YARN_NODEMANAGER', 'HDFS_DATANODE'],
|
||||
'floating_ip_pool': self.floating_ip_pool,
|
||||
'auto_security_group': True,
|
||||
'node_configs': {}
|
||||
'node_configs': {},
|
||||
'flavor_id': self.plugin_config.LARGE_FLAVOR
|
||||
}
|
||||
self.ng_tmpl_nm_dn_id = self.create_node_group_template(**template)
|
||||
self.addCleanup(self.delete_node_group_template, self.ng_tmpl_nm_dn_id)
|
||||
|
|
Loading…
Reference in New Issue