Revert "Initial scheduler support for instance_groups"

This reverts commit b2c17ae891b12118b9d11bf0ecc44e77956715c8.

While reviewing merged changes, I came across this one.  It's using the
conductor in a way that it shouldn't.  The scheduler has db access, so
there's no need to add the extra conductor overhead.  The best thing to
do here is to just revert for now, IMO.

Change-Id: Iaa0d67df7bb84913784d925cffebcd5f252249ea

2 files changed, 4 insertions, 59 deletions

diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index b86d3320a..7a33cfbb9 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -340,25 +340,7 @@ class _BaseTestCase(object):
         self.conductor.instance_destroy(self.context, {'uuid': 'fake-uuid'})
 
     def test_instance_info_cache_delete(self):
-        self.mox.StubOutWithMock(db, 'instance_system_metadata_get')
         self.mox.StubOutWithMock(db, 'instance_info_cache_delete')
-        fake_data = {}
-        db.instance_system_metadata_get(self.context,
-                'fake-uuid').AndReturn(fake_data)
-        db.instance_info_cache_delete(self.context, 'fake-uuid')
-        self.mox.ReplayAll()
-        self.conductor.instance_info_cache_delete(self.context,
-                                                  {'uuid': 'fake-uuid'})
-
-    def test_instance_info_cache_delete_with_instance_group(self):
-        self.mox.StubOutWithMock(db, 'instance_system_metadata_get')
-        self.mox.StubOutWithMock(db, 'instance_group_member_delete')
-        self.mox.StubOutWithMock(db, 'instance_info_cache_delete')
-        fake_data = {'instance_group': 'fake-group'}
-        db.instance_system_metadata_get(self.context,
-                'fake-uuid').AndReturn(fake_data)
-        db.instance_group_member_delete(self.context, 'fake-group',
-                'fake-uuid')
         db.instance_info_cache_delete(self.context, 'fake-uuid')
         self.mox.ReplayAll()
         self.conductor.instance_info_cache_delete(self.context,
@@ -456,38 +438,6 @@ class _BaseTestCase(object):
                                                       'fake-values')
         self.assertEqual(result, 'fake-result')
 
-    def test_instance_group_members_add(self):
-        self.mox.StubOutWithMock(db, 'instance_group_members_add')
-        db.instance_group_members_add(self.context, 'fake-uuid',
-                'fake-members', set_delete=False).AndReturn('fake-members')
-        self.mox.ReplayAll()
-        result = self.conductor.instance_group_members_add(self.context,
-                'fake-uuid', 'fake-members', set_delete=False)
-        self.assertEqual(result, 'fake-members')
-
-    def test_instance_group_member_delete(self):
-        self.mox.StubOutWithMock(db, 'instance_group_member_delete')
-        db.instance_group_member_delete(self.context, 'fake-uuid',
-                'fake-instance-id').AndReturn('fake-result')
-        self.mox.ReplayAll()
-        result = self.conductor.instance_group_member_delete(self.context,
-                'fake-uuid', 'fake-instance-id')
-        self.assertEqual(result, 'fake-result')
-
-    def test_instance_group_get_all(self):
-        self.mox.StubOutWithMock(db, 'instance_group_get')
-        self.mox.StubOutWithMock(db, 'instance_get_by_uuid')
-        group = {'uuid': 'fake-uuid',
-                 'members': ['fake-instance-id']}
-        db.instance_group_get(self.context, 'fake-uuid').AndReturn(group)
-        db.instance_get_by_uuid(self.context,
-                'fake-instance-id').AndReturn('fake-instance')
-        self.mox.ReplayAll()
-        result = self.conductor.instance_group_get_all(self.context,
-                'fake-uuid')
-        self.assertEqual(result, {'instance_group': group,
-                                  'instances': ['fake-instance']})
-
     def test_task_log_get(self):
         self.mox.StubOutWithMock(db, 'task_log_get')
         db.task_log_get(self.context, 'task', 'begin', 'end', 'host',
diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/scheduler/test_filter_scheduler.py
index a02889df9..d6cc7808e 100644
--- a/nova/tests/scheduler/test_filter_scheduler.py
+++ b/nova/tests/scheduler/test_filter_scheduler.py
@@ -532,7 +532,7 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
 
     def test_basic_schedule_run_instances_anti_affinity(self):
         filter_properties = {'scheduler_hints':
-                             {'instance_group': 'fake_uuid'}}
+                             {'group': 'cats'}}
         # Request spec 1
         instance_opts1 = {'project_id': 1, 'os_type': 'Linux',
                           'memory_mb': 512, 'root_gb': 512,
@@ -562,24 +562,19 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
 
         self.mox.StubOutWithMock(driver, 'instance_update_db')
         self.mox.StubOutWithMock(compute_rpcapi.ComputeAPI, 'run_instance')
-        self.mox.StubOutWithMock(sched, 'instance_group_data')
+        self.mox.StubOutWithMock(sched, 'group_hosts')
 
         instance1_1 = {'uuid': 'fake-uuid1-1'}
         instance1_2 = {'uuid': 'fake-uuid1-2'}
 
-        group_data = {'instance_group': {'uuid': 'fake_uuid',
-                                         'policies': ['anti-affinity']},
-                      'instances': []}
-        sched.instance_group_data(mox.IgnoreArg(),
-                'fake_uuid').AndReturn(group_data)
+        sched.group_hosts(mox.IgnoreArg(), 'cats').AndReturn([])
 
         def inc_launch_index1(*args, **kwargs):
             request_spec1['instance_properties']['launch_index'] = (
                 request_spec1['instance_properties']['launch_index'] + 1)
 
         expected_metadata = {'system_metadata':
-                             {'system': 'metadata',
-                              'instance_group': 'fake_uuid'}}
+                             {'system': 'metadata', 'group': 'cats'}}
         driver.instance_update_db(fake_context, instance1_1['uuid'],
                 extra_values=expected_metadata).WithSideEffects(
                 inc_launch_index1).AndReturn(instance1_1)