openstack/sahara
Code Issues Proposed changes

Merge "Remove resetting self.flavor_id in CDH test"

Browse Source
This commit is contained in:
Jenkins 2015-05-15 19:47:40 +00:00 committed by Gerrit Code Review
commit 1add54194f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sahara/tests/integration/tests/base.py
View File

@ -172,10 +172,13 @@ class ITestCase(testcase.WithAttributes, base.BaseTestCase):
def create_node_group_template(self, name, plugin_config, description, def create_node_group_template(self, name, plugin_config, description,
node_processes, node_configs, node_processes, node_configs,
volumes_per_node=0, volumes_size=0, 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( data = self.sahara.node_group_templates.create(
name, plugin_config.PLUGIN_NAME, plugin_config.HADOOP_VERSION, 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_processes, node_configs, floating_ip_pool, **kwargs)
node_group_template_id = data.id node_group_template_id = data.id
return node_group_template_id return node_group_template_id

4
sahara/tests/integration/tests/gating/test_cdh_gating.py
View File

@ -45,7 +45,6 @@ class CDHGatingTest(check_services.CheckServicesTest,
self.cluster_id = None self.cluster_id = None
self.cluster_template_id = None self.cluster_template_id = None
self.services_cluster_template_id = None self.services_cluster_template_id = None
self.flavor_id = self.plugin_config.LARGE_FLAVOR
def get_plugin_config(self): def get_plugin_config(self):
return cfg.ITConfig().cdh_config return cfg.ITConfig().cdh_config
@ -59,7 +58,8 @@ class CDHGatingTest(check_services.CheckServicesTest,
'node_processes': ['YARN_NODEMANAGER', 'HDFS_DATANODE'], 'node_processes': ['YARN_NODEMANAGER', 'HDFS_DATANODE'],
'floating_ip_pool': self.floating_ip_pool, 'floating_ip_pool': self.floating_ip_pool,
'auto_security_group': True, '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.ng_tmpl_nm_dn_id = self.create_node_group_template(**template)
self.addCleanup(self.delete_node_group_template, self.ng_tmpl_nm_dn_id) self.addCleanup(self.delete_node_group_template, self.ng_tmpl_nm_dn_id)