diff --git a/cinderclient/tests/unit/v3/test_group_snapshots.py b/cinderclient/tests/unit/v3/test_group_snapshots.py index 1642d3810..4ef45266e 100644 --- a/cinderclient/tests/unit/v3/test_group_snapshots.py +++ b/cinderclient/tests/unit/v3/test_group_snapshots.py @@ -45,12 +45,9 @@ class GroupSnapshotsTest(utils.TestCase): def test_create_group_snapshot_with_group_id(self): snap = cs.group_snapshots.create('1234') - expected = {'group_snapshot': {'status': 'creating', - 'description': None, - 'user_id': None, + expected = {'group_snapshot': {'description': None, 'name': None, - 'group_id': '1234', - 'project_id': None}} + 'group_id': '1234'}} cs.assert_called('POST', '/group_snapshots', body=expected) self._assert_request_id(snap) diff --git a/cinderclient/tests/unit/v3/test_groups.py b/cinderclient/tests/unit/v3/test_groups.py index d74e2a075..813d02dc8 100644 --- a/cinderclient/tests/unit/v3/test_groups.py +++ b/cinderclient/tests/unit/v3/test_groups.py @@ -45,14 +45,11 @@ class GroupsTest(utils.TestCase): def test_create_group_with_volume_types(self): grp = cs.groups.create('my_group_type', 'type1,type2', name='group') - expected = {'group': {'status': 'creating', - 'description': None, + expected = {'group': {'description': None, 'availability_zone': None, - 'user_id': None, 'name': 'group', 'group_type': 'my_group_type', - 'volume_types': ['type1', 'type2'], - 'project_id': None}} + 'volume_types': ['type1', 'type2']}} cs.assert_called('POST', '/groups', body=expected) self._assert_request_id(grp) diff --git a/cinderclient/tests/unit/v3/test_shell.py b/cinderclient/tests/unit/v3/test_shell.py index 6f713ca5d..2492cda0a 100644 --- a/cinderclient/tests/unit/v3/test_shell.py +++ b/cinderclient/tests/unit/v3/test_shell.py @@ -594,9 +594,6 @@ class ShellTest(utils.TestCase): def test_group_create(self): expected = {'group': {'name': 'test-1', 'description': 'test-1-desc', - 'user_id': None, - 'project_id': None, - 'status': 'creating', 'group_type': 'my_group_type', 'volume_types': ['type1', 'type2'], 'availability_zone': 'zone1'}} @@ -642,10 +639,7 @@ class ShellTest(utils.TestCase): def test_group_snapshot_create(self): expected = {'group_snapshot': {'name': 'test-1', 'description': 'test-1-desc', - 'user_id': None, - 'project_id': None, - 'group_id': '1234', - 'status': 'creating'}} + 'group_id': '1234'}} self.run_command('--os-volume-api-version 3.14 ' 'group-snapshot-create --name test-1 ' '--description test-1-desc 1234') diff --git a/cinderclient/v3/group_snapshots.py b/cinderclient/v3/group_snapshots.py index 461a41c68..741149d70 100644 --- a/cinderclient/v3/group_snapshots.py +++ b/cinderclient/v3/group_snapshots.py @@ -62,9 +62,6 @@ class GroupSnapshotManager(base.ManagerWithFind): 'group_id': group_id, 'name': name, 'description': description, - 'user_id': user_id, - 'project_id': project_id, - 'status': "creating", } } diff --git a/cinderclient/v3/groups.py b/cinderclient/v3/groups.py index d22afe429..f1544c31d 100644 --- a/cinderclient/v3/groups.py +++ b/cinderclient/v3/groups.py @@ -81,10 +81,7 @@ class GroupManager(base.ManagerWithFind): 'description': description, 'group_type': group_type, 'volume_types': volume_types.split(','), - 'user_id': user_id, - 'project_id': project_id, 'availability_zone': availability_zone, - 'status': "creating", }} return self._create('/groups', body, 'group')