From 7b39ef953a7157ab657329fc02075056e2d8a93a Mon Sep 17 00:00:00 2001
From: Brian Elliott <brian.elliott@rackspace.com>
Date: Tue, 20 Nov 2012 20:34:11 +0000
Subject: Cleanup compute multi-node assignment of node

Move assignment of the node field on the instance to the compute host
to be more consistent with how the host field is assigned and handled
by the resource tracker.

Change-Id: Id3086585a99350abbab387932e689825b33ab6b5
---
 nova/tests/compute/test_compute.py          | 11 ++++++++++-
 nova/tests/compute/test_resource_tracker.py |  1 +
 nova/tests/compute/test_rpcapi.py           |  3 ++-
 nova/tests/scheduler/test_scheduler.py      |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 206c5d694..a7e06cf92 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -511,6 +511,15 @@ class ComputeTestCase(BaseTestCase):
                 self.compute.run_instance, self.context, instance=instance,
                 filter_properties=filter_properties)
 
+    def test_create_instance_without_node_param(self):
+        instance = self._create_fake_instance({'node': None})
+
+        self.compute.run_instance(self.context, instance=instance)
+        instances = db.instance_get_all(self.context)
+        instance = instances[0]
+
+        self.assertEqual(NODENAME, instance['node'])
+
     def test_default_access_ip(self):
         self.flags(default_access_ip_network_name='test1')
         fake_network.unset_stub_network_methods(self.stubs)
@@ -5838,7 +5847,7 @@ class ComputeRescheduleOrReraiseTestCase(BaseTestCase):
 
         self.mox.ReplayAll()
         self.compute._run_instance(self.context, None, {}, None, None, None,
-                False, self.instance)
+                False, None, self.instance)
 
     def test_deallocate_network_fail(self):
         """Test de-allocation of network failing before re-scheduling logic
diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py
index b9fd738fa..85d6c3dd6 100644
--- a/nova/tests/compute/test_resource_tracker.py
+++ b/nova/tests/compute/test_resource_tracker.py
@@ -154,6 +154,7 @@ class BaseTestCase(test.TestCase):
             'project_id': '123456',
             'vcpus': 1,
             'host': None,
+            'node': None,
             'instance_type_id': 1,
             'launched_on': None,
         }
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index bef7a4d3d..d0796a27d 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -310,7 +310,8 @@ class ComputeRpcAPITestCase(test.TestCase):
                 instance=self.fake_instance, host='fake_host',
                 request_spec='fake_spec', filter_properties={},
                 requested_networks='networks', injected_files='files',
-                admin_password='pw', is_first_time=True)
+                admin_password='pw', is_first_time=True, node='node',
+                version='2.19')
 
     def test_set_admin_password(self):
         self._test_compute_api('set_admin_password', 'call',
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index 78f2c7b9e..e17dae8bc 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -653,7 +653,7 @@ class SchedulerDriverModuleTestCase(test.TestCase):
 
         timeutils.utcnow().AndReturn('fake-now')
         db.instance_update(self.context, 'fake_uuid',
-                {'host': None, 'scheduled_at': 'fake-now'})
+                {'host': None, 'node': None, 'scheduled_at': 'fake-now'})
         rpc.queue_get_for(self.context, 'compute', host).AndReturn(queue)
         rpc.cast(self.context, queue,
                 {'method': method,
-- 
cgit