diff --git a/nova/db/api.py b/nova/db/api.py index 4459771b2ef3..8c94bd4988ca 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -939,23 +939,6 @@ def instance_group_get_all_by_project_id(context, project_id): return IMPL.instance_group_get_all_by_project_id(context, project_id) -def instance_group_members_add(context, group_uuid, members, - set_delete=False): - """Add members to the group.""" - return IMPL.instance_group_members_add(context, group_uuid, members, - set_delete=set_delete) - - -def instance_group_member_delete(context, group_uuid, instance_id): - """Delete a specific member from the group.""" - return IMPL.instance_group_member_delete(context, group_uuid, instance_id) - - -def instance_group_members_get(context, group_uuid): - """Get the members from the group.""" - return IMPL.instance_group_members_get(context, group_uuid) - - ################### diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 76a425132ae6..03defeef581b 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -5845,37 +5845,6 @@ def _instance_group_members_add(context, id, members, set_delete=False): return members -@pick_context_manager_writer -def instance_group_members_add(context, group_uuid, members, - set_delete=False): - id = _instance_group_id(context, group_uuid) - return _instance_group_members_add(context, id, members, - set_delete=set_delete) - - -@pick_context_manager_writer -def instance_group_member_delete(context, group_uuid, instance_id): - id = _instance_group_id(context, group_uuid) - count = _instance_group_model_get_query(context, - models.InstanceGroupMember, - id).\ - filter_by(instance_id=instance_id).\ - soft_delete() - if count == 0: - raise exception.InstanceGroupMemberNotFound(group_uuid=group_uuid, - instance_id=instance_id) - - -@pick_context_manager_reader -def instance_group_members_get(context, group_uuid): - id = _instance_group_id(context, group_uuid) - instances = model_query(context, - models.InstanceGroupMember, - (models.InstanceGroupMember.instance_id,)).\ - filter_by(group_id=id).all() - return [instance[0] for instance in instances] - - def _instance_group_policies_add(context, id, policies, set_delete=False): allpols = set(policies) query = _instance_group_model_get_query(context, diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py index 60bd0a82bbcd..927791192282 100644 --- a/nova/tests/unit/db/test_db_api.py +++ b/nova/tests/unit/db/test_db_api.py @@ -8651,18 +8651,6 @@ class InstanceGroupDBApiTestCase(test.TestCase, ModelsObjectComparatorMixin): db.instance_group_update, self.context, 'invalid_id', values) - def test_instance_group_get_by_instance(self): - values = self._get_default_values() - group1 = self._create_instance_group(self.context, values) - - members = ['instance_id1', 'instance_id2'] - db.instance_group_members_add(self.context, group1.uuid, members) - - group2 = db.instance_group_get_by_instance(self.context, - 'instance_id1') - - self.assertEqual(group2.uuid, group1.uuid) - def test_instance_group_get_by_other_project_user(self): values = self._get_default_values() result = self._create_instance_group(self.context, values) @@ -8692,64 +8680,6 @@ class InstanceGroupMembersDBApiTestCase(InstanceGroupDBApiTestCase): self._assertEqualObjects(result, values, ignored_keys) self._assertEqualListsOfPrimitivesAsSets(result['members'], members) - def test_instance_group_members_add(self): - values = self._get_default_values() - values['uuid'] = 'fake_id' - result = self._create_instance_group(self.context, values) - id = result['uuid'] - members = db.instance_group_members_get(self.context, id) - self.assertEqual(members, []) - members2 = ['instance_id1', 'instance_id2'] - db.instance_group_members_add(self.context, id, members2) - members = db.instance_group_members_get(self.context, id) - self._assertEqualListsOfPrimitivesAsSets(members, members2) - - def test_instance_group_members_update(self): - values = self._get_default_values() - values['uuid'] = 'fake_id' - result = self._create_instance_group(self.context, values) - id = result['uuid'] - members2 = ['instance_id1', 'instance_id2'] - db.instance_group_members_add(self.context, id, members2) - members = db.instance_group_members_get(self.context, id) - self._assertEqualListsOfPrimitivesAsSets(members, members2) - # check add with existing keys - members3 = ['instance_id1', 'instance_id2', 'instance_id3'] - db.instance_group_members_add(self.context, id, members3) - members = db.instance_group_members_get(self.context, id) - self._assertEqualListsOfPrimitivesAsSets(members, members3) - - def test_instance_group_members_delete(self): - values = self._get_default_values() - values['uuid'] = 'fake_id' - result = self._create_instance_group(self.context, values) - id = result['uuid'] - members3 = ['instance_id1', 'instance_id2', 'instance_id3'] - db.instance_group_members_add(self.context, id, members3) - members = db.instance_group_members_get(self.context, id) - self._assertEqualListsOfPrimitivesAsSets(members, members3) - for instance_id in members3[:]: - db.instance_group_member_delete(self.context, id, instance_id) - members3.remove(instance_id) - members = db.instance_group_members_get(self.context, id) - self._assertEqualListsOfPrimitivesAsSets(members, members3) - - def test_instance_group_members_invalid_ids(self): - values = self._get_default_values() - result = self._create_instance_group(self.context, values) - id = result['uuid'] - self.assertRaises(exception.InstanceGroupNotFound, - db.instance_group_members_get, - self.context, 'invalid') - self.assertRaises(exception.InstanceGroupNotFound, - db.instance_group_member_delete, self.context, - 'invalidid', 'instance_id1') - members = ['instance_id1', 'instance_id2'] - db.instance_group_members_add(self.context, id, members) - self.assertRaises(exception.InstanceGroupMemberNotFound, - db.instance_group_member_delete, - self.context, id, 'invalid_id') - class InstanceGroupPoliciesDBApiTestCase(InstanceGroupDBApiTestCase): def test_instance_group_policies_on_create(self):