Define a hypervisor driver method for getting MAC addresses.

This lets hypervisors export the MAC addresses an instance needs to have (or
return the default of None if the hypervisor is not constrained by MAC
addresses).  being provisioned.

Change-Id: I319a8deb2d09fbf8cecb7071256cf931924ef0e9

3 files changed, 53 insertions, 1 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 08d9451b3..7285c385f 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -1510,6 +1510,27 @@ class ComputeTestCase(BaseTestCase):
                           instance=instance)
         self.compute.terminate_instance(self.context, instance=instance)
 
+    def test_run_instance_queries_macs(self):
+        # run_instance should ask the driver for node mac addresses and pass
+        # that to the network_api in use.
+        fake_network.unset_stub_network_methods(self.stubs)
+        instance = jsonutils.to_primitive(self._create_fake_instance())
+
+        macs = set(['01:23:45:67:89:ab'])
+        self.mox.StubOutWithMock(self.compute.network_api,
+                                 "allocate_for_instance")
+        self.compute.network_api.allocate_for_instance(
+            mox.IgnoreArg(),
+            mox.IgnoreArg(),
+            requested_networks=None,
+            vpn=False, macs=macs).AndReturn(
+                fake_network.fake_get_instance_nw_info(self.stubs, 1, 1,
+                                                       spectacular=True))
+        self.mox.StubOutWithMock(self.compute.driver, "macs_for_instance")
+        self.compute.driver.macs_for_instance(instance).AndReturn(macs)
+        self.mox.ReplayAll()
+        self.compute.run_instance(self.context, instance=instance)
+
     def test_instance_set_to_error_on_uncaught_exception(self):
         # Test that instance is set to error state when exception is raised.
         instance = jsonutils.to_primitive(self._create_fake_instance())
@@ -1520,7 +1541,8 @@ class ComputeTestCase(BaseTestCase):
                 mox.IgnoreArg(),
                 mox.IgnoreArg(),
                 requested_networks=None,
-                vpn=False).AndRaise(rpc_common.RemoteError())
+                vpn=False,
+                macs=None).AndRaise(rpc_common.RemoteError())
 
         fake_network.unset_stub_network_methods(self.stubs)
 
diff --git a/nova/tests/network/test_api.py b/nova/tests/network/test_api.py
index 94cccd9d9..959c5a472 100644
--- a/nova/tests/network/test_api.py
+++ b/nova/tests/network/test_api.py
@@ -17,8 +17,11 @@
 
 """Tests for network API."""
 
+import itertools
 import random
 
+import mox
+
 from nova import context
 from nova import exception
 from nova import network
@@ -37,6 +40,25 @@ class ApiTestCase(test.TestCase):
         self.context = context.RequestContext('fake-user',
                                               'fake-project')
 
+    def test_allocate_for_instance_handles_macs_passed(self):
+        # If a macs argument is supplied to the 'nova-network' API, it is just
+        # ignored. This test checks that the call down to the rpcapi layer
+        # doesn't pass macs down: nova-network doesn't support hypervisor
+        # mac address limits (today anyhow).
+        macs = set(['ab:cd:ef:01:23:34'])
+        self.mox.StubOutWithMock(
+            self.network_api.network_rpcapi, "allocate_for_instance")
+        kwargs = dict(zip(['host', 'instance_id', 'instance_uuid',
+            'project_id', 'requested_networks', 'rxtx_factor', 'vpn'],
+            itertools.repeat(mox.IgnoreArg())))
+        self.network_api.network_rpcapi.allocate_for_instance(
+            mox.IgnoreArg(), **kwargs).AndReturn([])
+        self.mox.ReplayAll()
+        instance = dict(id='id', uuid='uuid', project_id='project_id',
+            host='host', instance_type={'rxtx_factor': 0})
+        self.network_api.allocate_for_instance(
+            'context', instance, 'vpn', 'requested_networks', macs=macs)
+
     def _do_test_associate_floating_ip(self, orig_instance_uuid):
         """Test post-association logic."""
 
diff --git a/nova/tests/network/test_quantumv2.py b/nova/tests/network/test_quantumv2.py
index 004e76071..f92dba443 100644
--- a/nova/tests/network/test_quantumv2.py
+++ b/nova/tests/network/test_quantumv2.py
@@ -420,6 +420,14 @@ class TestQuantumv2(test.TestCase):
         # Allocate one port in two networks env.
         self._allocate_for_instance(2)
 
+    def test_allocate_for_instance_accepts_macs_kwargs_None(self):
+        # The macs kwarg should be accepted as None.
+        self._allocate_for_instance(1, macs=None)
+
+    def test_allocate_for_instance_accepts_macs_kwargs_set(self):
+        # The macs kwarg should be accepted, as a set.
+        self._allocate_for_instance(1, macs=set(['ab:cd:ef:01:23:45']))
+
     def test_allocate_for_instance_with_requested_networks(self):
         # specify only first and last network
         requested_networks = [