openstack
/
sahara
Code Issues Proposed changes

Merge "Node Groups now have id field"

This commit is contained in:
Jenkins 2015-03-13 14:44:44 +00:00 committed by Gerrit Code Review
parent 7403ea6b6f b05903568c
commit 75c1431797
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara/conductor/resource.py
View File

@ -194,7 +194,7 @@ class NodeGroupResource(Resource, objects.NodeGroup):
'node_group_template': (NodeGroupTemplateResource, None)
}
_filter_fields = ['id', 'tenant_id', 'cluster_id', 'cluster_template_id',
_filter_fields = ['tenant_id', 'cluster_id', 'cluster_template_id',
'image_username', 'open_ports']

2
sahara/tests/unit/conductor/test_resource.py
View File

@ -42,8 +42,10 @@ SAMPLE_CLUSTER_DICT = {
'node_groups': [
{
'name': 'master',
'id': 'some_id'
},
{
'id': 'some_id',
'name': 'worker',
'node_processes': ['tasktracker', 'datanode'],
'node_configs': {},