Merge lp:~vishvananda/nova/ha-net into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Adds HA networking (multi_host) option to networks.

* Adds extra flag for network creation: multi_host.
* Multi hosts networks will send all network related commands to the host that the vm is on.
* Requires nova-network to be run on every compute host.
* Non multi_host networks work the same way.
* Moved extra db access out of linux_net (there is still a little in the dhcp leases part that should probably be moved)
* Fixed the logic on auto_assign which was messed up

Adds HA networking option to networks.

* Adds extra flag for network creation: multi_host.
* Multi hosts networks will send all network related commands to the host that the vm is on.
* Requires nova-network to be run on every compute host.
* Non multi_host networks work the same way.

Other cleanup:

* Moved extra db access out of linux_net (there is still a little in the dhcp leases part that should probably be moved)
* Fixed the logic on auto_assign which was messed up

Potential issues:
* The flag version means I'm checking for multi_host in a number of places. Ideas for changes here welcome.
* Nova-manage positional changes are annoying, we need the kwarg version in place
* No tests added. Open to suggestions on some specific tests that could be added.

[Jason Kölker (jason-koelker)]

48: multi_host = multi_host == 'T'

I think something like:

multi_host = multi_host.lower()[:1] == 't'

so it can accept any "truthy" value would be more user friendly.

[Mandell (mdegerne)]

I like Jason's suggestion, although I would want to check for "y" as well.

I'm a bit concerned about the way which _on_set_network_host is being called. It seems to imply that all hosts are in a single HA network. Is it possible that there are multiple, disparate, HA networks?

[Lucky (luckythetourist)]

Other than the above I have a single nit:

On L583-584 the order of operations should be explicit

e.g.,

    (foo and bar) or baz

or

    foo and (bar or baz)

[Vish Ishaya (vishvananda)]

On Jul 7, 2011, at 3:13 PM, Mandell wrote:

> I like Jason's suggestion, although I would want to check for "y" as well.
>

Will fix. I was following the use of T in a few other places, so switching the others should be done in the branch that is adding in better opt parsing

> I'm a bit concerned about the way which _on_set_network_host is being called. It seems to imply that all hosts are in a single HA network. Is it possible that there are multiple, disparate, HA networks?

My current mental model says HA networks belong to all hosts. I think this is the most common use case. That said, I can change the init host to look for ha networks that already have an ip on this host, and only on_set_network_host there, then I can also call it from the associate call in _get_dhcp_ip. That should make the network only show up on the host if it is being used.

Vish

[Vish Ishaya (vishvananda)]

Cleaned up stuff and made changes to make setup of networks automatic if an ip is allocated and the network has not been setup yet.

[Koji Iida (iida-koji)]

I have a question.

I can't boot a instance under VlanManager and multi_host set to false.

2011-07-16 13:21:37,094 DEBUG nova.network.manager [H40YHKSORHMMV047X7BB admin admin] floating IP allocation for instance |1| from (pid=9900) allocate_for_instance /opt2/ha-net/nova/network/manager.py:195
2011-07-16 13:21:37,094 DEBUG nova.network.manager [H40YHKSORHMMV047X7BB admin admin] network allocations for instance 1 from (pid=9900) allocate_for_instance /opt2/ha-net/nova/network/manager.py:378
2011-07-16 13:21:37,102 ERROR nova [-] Exception during message handling
(nova): TRACE: Traceback (most recent call last):
(nova): TRACE: File "/opt2/ha-net/nova/rpc.py", line 232, in _process_data
(nova): TRACE: rval = node_func(context=ctxt, **node_args)
(nova): TRACE: File "/opt2/ha-net/nova/network/manager.py", line 199, in allocate_for_instance
(nova): TRACE: ips = super(FloatingIP, self).allocate_for_instance(context, **kwargs)
(nova): TRACE: File "/opt2/ha-net/nova/network/manager.py", line 380, in allocate_for_instance
(nova): TRACE: project_id)
(nova): TRACE: File "/opt2/ha-net/nova/network/manager.py", line 847, in _get_networks_for_instance
(nova): TRACE: return self.db.project_get_networks(context, project_id)
(nova): TRACE: File "/opt2/ha-net/nova/db/api.py", line 1234, in project_get_networks
(nova): TRACE: return IMPL.project_get_networks(context, project_id, associate)
(nova): TRACE: File "/opt2/ha-net/nova/db/sqlalchemy/api.py", line 115, in wrapper
(nova): TRACE: return f(*args, **kwargs)
(nova): TRACE: File "/opt2/ha-net/nova/db/sqlalchemy/api.py", line 2749, in project_get_networks
(nova): TRACE: return [network_associate(context, project_id)]
(nova): TRACE: File "/opt2/ha-net/nova/db/sqlalchemy/api.py", line 97, in wrapper
(nova): TRACE: return f(*args, **kwargs)
(nova): TRACE: File "/opt2/ha-net/nova/db/sqlalchemy/api.py", line 1516, in network_associate
(nova): TRACE: raise db.NoMoreNetworks()
(nova): TRACE: NoMoreNetworks: None
(nova): TRACE:

615 - # setup any new networks which have been created
616 - self.set_network_hosts(context)

set_network_hosts() is removed from periodic_tasks.
Are there any other mechanisms to allocate host to network?

review: Needs Information

[Vish Ishaya (vishvananda)]

Hmm, this could be a bug. It is supposed to set_network_host in the allocate_for_instance call. I must have missed one of the code paths. Will check.

Vish

On Jul 15, 2011, at 11:33 PM, Koji Iida wrote:

> Review: Needs Information
> I have a question.
>
> I can't boot a instance under VlanManager and multi_host set to false.
>
> 2011-07-16 13:21:37,094 DEBUG nova.network.manager [H40YHKSORHMMV047X7BB admin admin] floating IP allocation for instance |1| from (pid=9900) allocate_for_instance /opt2/ha-net/nova/network/manager.py:195
> 2011-07-16 13:21:37,094 DEBUG nova.network.manager [H40YHKSORHMMV047X7BB admin admin] network allocations for instance 1 from (pid=9900) allocate_for_instance /opt2/ha-net/nova/network/manager.py:378
> 2011-07-16 13:21:37,102 ERROR nova [-] Exception during message handling
> (nova): TRACE: Traceback (most recent call last):
> (nova): TRACE: File "/opt2/ha-net/nova/rpc.py", line 232, in _process_data
> (nova): TRACE: rval = node_func(context=ctxt, **node_args)
> (nova): TRACE: File "/opt2/ha-net/nova/network/manager.py", line 199, in allocate_for_instance
> (nova): TRACE: ips = super(FloatingIP, self).allocate_for_instance(context, **kwargs)
> (nova): TRACE: File "/opt2/ha-net/nova/network/manager.py", line 380, in allocate_for_instance
> (nova): TRACE: project_id)
> (nova): TRACE: File "/opt2/ha-net/nova/network/manager.py", line 847, in _get_networks_for_instance
> (nova): TRACE: return self.db.project_get_networks(context, project_id)
> (nova): TRACE: File "/opt2/ha-net/nova/db/api.py", line 1234, in project_get_networks
> (nova): TRACE: return IMPL.project_get_networks(context, project_id, associate)
> (nova): TRACE: File "/opt2/ha-net/nova/db/sqlalchemy/api.py", line 115, in wrapper
> (nova): TRACE: return f(*args, **kwargs)
> (nova): TRACE: File "/opt2/ha-net/nova/db/sqlalchemy/api.py", line 2749, in project_get_networks
> (nova): TRACE: return [network_associate(context, project_id)]
> (nova): TRACE: File "/opt2/ha-net/nova/db/sqlalchemy/api.py", line 97, in wrapper
> (nova): TRACE: return f(*args, **kwargs)
> (nova): TRACE: File "/opt2/ha-net/nova/db/sqlalchemy/api.py", line 1516, in network_associate
> (nova): TRACE: raise db.NoMoreNetworks()
> (nova): TRACE: NoMoreNetworks: None
> (nova): TRACE:
>
>
> 615 - # setup any new networks which have been created
> 616 - self.set_network_hosts(context)
>
> set_network_hosts() is removed from periodic_tasks.
> Are there any other mechanisms to allocate host to network?
>
>
>
>
> --
> https://code.launchpad.net/~vishvananda/nova/ha-net/+merge/67078
> You are the owner of lp:~vishvananda/nova/ha-net.

[lp:~vishvananda/nova/ha-net]

1259. By Vish Ishaya on 2011-07-18

fix issues that were breaking vlan mode

[Vish Ishaya (vishvananda)]

koji. I fixed the issue with vlan mode. Can you try again?

[lp:~vishvananda/nova/ha-net]

1260. By Vish Ishaya on 2011-07-18

merged trunk

1261. By Vish Ishaya on 2011-07-19

change migration number

1262. By Vish Ishaya on 2011-07-19

fix bad merge

1263. By Vish Ishaya on 2011-07-19

missed the vpn kwarg in rpc

[Dan Prince (dan-prince)]

Hey Vish,

Would you be up for adding a 'downgrade' to this migration. I know not all of our migrations have them but I'd prefer to follow that model.

Otherwise looks good. All functional tests appear to be passing on Smokestack too.

[lp:~vishvananda/nova/ha-net]

1264. By Vish Ishaya on 2011-07-19

add downgrade

[Vish Ishaya (vishvananda)]

Hey Dan,

Added a downgrade.

[Dan Prince (dan-prince)]

Great. Looks good.

review: Approve

[lp:~vishvananda/nova/ha-net]

1265. By Vish Ishaya on 2011-07-20

merged trunk

1266. By Vish Ishaya on 2011-07-20

pep8

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Do Dinh Thang (thangdd-it49)]

Hi Vish,
I setup & run nova-network in multi_host mode.
when I restart service nova-network on Node1, i must rerun "euca-associate-address" to associate floating IP to instance on Node1.
Is it a bug?

[Vish Ishaya (vishvananda)]

It should reassociate the floating ips on reboot. This sounds like a bug.

On Aug 16, 2011, at 2:11 AM, Do Dinh Thang wrote:

> Hi Vish,
> I setup & run nova-network in multi_host mode.
> when I restart service nova-network on Node1, i must rerun "euca-associate-address" to associate floating IP to instance on Node1.
> Is it a bug?
> --
> https://code.launchpad.net/~vishvananda/nova/ha-net/+merge/67078
> You are the owner of lp:~vishvananda/nova/ha-net.

=== modified file 'bin/nova-dhcpbridge'
--- bin/nova-dhcpbridge	2011-07-11 20:31:39 +0000
+++ bin/nova-dhcpbridge	2011-07-20 18:28:31 +0000
@@ -91,7 +91,7 @@
     """Get the list of hosts for an interface."""
     ctxt = context.get_admin_context()
     network_ref = db.network_get_by_bridge(ctxt, interface)
-    return linux_net.get_dhcp_leases(ctxt, network_ref['id'])
+    return linux_net.get_dhcp_leases(ctxt, network_ref)
 
 
 def main():
 
=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-07-18 19:09:39 +0000
+++ bin/nova-manage	2011-07-20 18:28:31 +0000
@@ -479,7 +479,7 @@
         except db.api.NoMoreNetworks:
             print _('No more networks available. If this is a new '
                     'installation, you need\nto call something like this:\n\n'
-                    '    nova-manage network create 10.0.0.0/8 10 64\n\n')
+                    '  nova-manage network create pvt 10.0.0.0/8 10 64\n\n')
         except exception.ProcessExecutionError, e:
             print e
             print _("The above error may show that the certificate db has not "
@@ -500,7 +500,7 @@
             if host is None:
                 fixed_ips = db.fixed_ip_get_all(ctxt)
             else:
-                fixed_ips = db.fixed_ip_get_all_by_host(ctxt, host)
+                fixed_ips = db.fixed_ip_get_all_by_instance_host(ctxt, host)
         except exception.NotFound as ex:
             print "error: %s" % ex
             sys.exit(2)
@@ -564,17 +564,17 @@
     """Class for managing networks."""
 
     def create(self, label=None, fixed_range=None, num_networks=None,
-               network_size=None, vlan_start=None,
+               network_size=None, multi_host=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
                flat_network_bridge=None, bridge_interface=None):
         """Creates fixed ips for host by range
         arguments: label, fixed_range, [num_networks=FLAG],
-                   [network_size=FLAG], [vlan_start=FLAG],
+                   [network_size=FLAG], [multi_host=FLAG], [vlan_start=FLAG],
                    [vpn_start=FLAG], [fixed_range_v6=FLAG], [gateway_v6=FLAG],
                    [flat_network_bridge=FLAG], [bridge_interface=FLAG]
-        If you wish to use a later argument fill in the gaps with 0s
-        Ex: network create private 10.0.0.0/8 1 15 0 0 0 0 xenbr1 eth1
-            network create private 10.0.0.0/8 1 15
+        If you wish to use a later argument fill in the gaps with ""s
+        Ex: network create private 10.0.0.0/8 1 16 T "" "" "" "" xenbr1 eth1
+            network create private 10.0.0.0/8 1 16
         """
         if not label:
             msg = _('a label (ex: public) is required to create networks.')
@@ -589,6 +589,10 @@
             num_networks = FLAGS.num_networks
         if not network_size:
             network_size = FLAGS.network_size
+        if not multi_host:
+            multi_host = FLAGS.multi_host
+        else:
+            multi_host = multi_host == 'T'
         if not vlan_start:
             vlan_start = FLAGS.vlan_start
         if not vpn_start:
@@ -607,6 +611,7 @@
             net_manager.create_networks(context.get_admin_context(),
                                         label=label,
                                         cidr=fixed_range,
+                                        multi_host=multi_host,
                                         num_networks=int(num_networks),
                                         network_size=int(network_size),
                                         vlan_start=int(vlan_start),
 
=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2011-07-19 20:21:39 +0000
+++ nova/compute/manager.py	2011-07-20 18:28:31 +0000
@@ -77,8 +77,6 @@
 flags.DEFINE_integer("rescue_timeout", 0,
                      "Automatically unrescue an instance after N seconds."
                      " Set to 0 to disable.")
-flags.DEFINE_bool('auto_assign_floating_ip', False,
-                  'Autoassigning floating ip to VM')
 flags.DEFINE_integer('host_state_interval', 120,
                      'Interval in seconds for querying the host status')
 
@@ -274,16 +272,19 @@
         """Launch a new instance with specified options."""
         context = context.elevated()
         instance = self.db.instance_get(context, instance_id)
-        instance.injected_files = kwargs.get('injected_files', [])
-        instance.admin_pass = kwargs.get('admin_password', None)
         if instance['name'] in self.driver.list_instances():
             raise exception.Error(_("Instance has already been created"))
         LOG.audit(_("instance %s: starting..."), instance_id,
                   context=context)
-        self.db.instance_update(context,
-                                instance_id,
-                                {'host': self.host, 'launched_on': self.host})
-
+        updates = {}
+        updates['host'] = self.host
+        updates['launched_on'] = self.host
+        # NOTE(vish): used by virt but not in database
+        updates['injected_files'] = kwargs.get('injected_files', [])
+        updates['admin_pass'] = kwargs.get('admin_password', None)
+        instance = self.db.instance_update(context,
+                                           instance_id,
+                                           updates)
         self.db.instance_set_state(context,
                                    instance_id,
                                    power_state.NOSTATE,
 
=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-07-08 03:07:58 +0000
+++ nova/db/api.py	2011-07-20 18:28:31 +0000
@@ -332,13 +332,14 @@
     return IMPL.fixed_ip_associate(context, address, instance_id)
 
 
-def fixed_ip_associate_pool(context, network_id, instance_id):
-    """Find free ip in network and associate it to instance.
+def fixed_ip_associate_pool(context, network_id, instance_id=None, host=None):
+    """Find free ip in network and associate it to instance or host.
 
     Raises if one is not available.
 
     """
-    return IMPL.fixed_ip_associate_pool(context, network_id, instance_id)
+    return IMPL.fixed_ip_associate_pool(context, network_id,
+                                        instance_id, host)
 
 
 def fixed_ip_create(context, values):
@@ -361,9 +362,9 @@
     return IMPL.fixed_ip_get_all(context)
 
 
-def fixed_ip_get_all_by_host(context, host):
-    """Get all defined fixed ips used by a host."""
-    return IMPL.fixed_ip_get_all_by_host(context, host)
+def fixed_ip_get_all_by_instance_host(context, host):
+    """Get all allocated fixed ips filtered by instance host."""
+    return IMPL.fixed_ip_get_all_instance_by_host(context, host)
 
 
 def fixed_ip_get_by_address(context, address):
@@ -376,6 +377,11 @@
     return IMPL.fixed_ip_get_by_instance(context, instance_id)
 
 
+def fixed_ip_get_by_network_host(context, network_id, host):
+    """Get fixed ip for a host in a network."""
+    return IMPL.fixed_ip_get_by_network_host(context, network_id, host)
+
+
 def fixed_ip_get_by_virtual_interface(context, vif_id):
     """Get fixed ips by virtual interface or raise if none exist."""
     return IMPL.fixed_ip_get_by_virtual_interface(context, vif_id)
 
=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-07-18 23:42:02 +0000
+++ nova/db/sqlalchemy/api.py	2011-07-20 18:28:31 +0000
@@ -18,7 +18,6 @@
 """
 Implementation of SQLAlchemy backend.
 """
-import traceback
 import warnings
 
 from nova import db
@@ -33,7 +32,6 @@
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm import joinedload_all
-from sqlalchemy.sql import exists
 from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import literal_column
 
@@ -672,7 +670,7 @@
 
 
 @require_admin_context
-def fixed_ip_associate_pool(context, network_id, instance_id):
+def fixed_ip_associate_pool(context, network_id, instance_id=None, host=None):
     session = get_session()
     with session.begin():
         network_or_none = or_(models.FixedIp.network_id == network_id,
@@ -682,6 +680,7 @@
                                filter_by(reserved=False).\
                                filter_by(deleted=False).\
                                filter_by(instance=None).\
+                               filter_by(host=None).\
                                with_lockmode('update').\
                                first()
         # NOTE(vish): if with_lockmode isn't supported, as in sqlite,
@@ -692,9 +691,12 @@
             fixed_ip_ref.network = network_get(context,
                                            network_id,
                                            session=session)
-        fixed_ip_ref.instance = instance_get(context,
-                                             instance_id,
-                                             session=session)
+        if instance_id:
+            fixed_ip_ref.instance = instance_get(context,
+                                                 instance_id,
+                                                 session=session)
+        if host:
+            fixed_ip_ref.host = host
         session.add(fixed_ip_ref)
     return fixed_ip_ref['address']
 
@@ -750,7 +752,7 @@
 
 
 @require_admin_context
-def fixed_ip_get_all_by_host(context, host=None):
+def fixed_ip_get_all_by_instance_host(context, host=None):
     session = get_session()
 
     result = session.query(models.FixedIp).\
@@ -800,6 +802,20 @@
 
 
 @require_context
+def fixed_ip_get_by_network_host(context, network_id, host):
+    session = get_session()
+    rv = session.query(models.FixedIp).\
+                 filter_by(network_id=network_id).\
+                 filter_by(host=host).\
+                 filter_by(deleted=False).\
+                 first()
+    if not rv:
+        raise exception.FixedIpNotFoundForNetworkHost(network_id=network_id,
+                                                      host=host)
+    return rv
+
+
+@require_context
 def fixed_ip_get_by_virtual_interface(context, vif_id):
     session = get_session()
     rv = session.query(models.FixedIp).\
@@ -1480,8 +1496,6 @@
     called by project_get_networks under certain conditions
     and network manager add_network_to_project()
 
-    only associates projects with networks that have configured hosts
-
     only associate if the project doesn't already have a network
     or if force is True
 
@@ -1497,7 +1511,6 @@
         def network_query(project_filter):
             return session.query(models.Network).\
                            filter_by(deleted=False).\
-                           filter(models.Network.host != None).\
                            filter_by(project_id=project_filter).\
                            with_lockmode('update').\
                            first()
@@ -1704,9 +1717,16 @@
 def network_get_all_by_host(context, host):
     session = get_session()
     with session.begin():
+        # NOTE(vish): return networks that have host set
+        #             or that have a fixed ip with host set
+        host_filter = or_(models.Network.host == host,
+                          models.FixedIp.host == host)
+
         return session.query(models.Network).\
                        filter_by(deleted=False).\
-                       filter_by(host=host).\
+                       join(models.Network.fixed_ips).\
+                       filter(host_filter).\
+                       filter_by(deleted=False).\
                        all()
 
 
@@ -1738,6 +1758,7 @@
         network_ref = network_get(context, network_id, session=session)
         network_ref.update(values)
         network_ref.save(session=session)
+        return network_ref
 
 
 ###################
 
=== added file 'nova/db/sqlalchemy/migrate_repo/versions/033_ha_network.py'
--- nova/db/sqlalchemy/migrate_repo/versions/033_ha_network.py	1970-01-01 00:00:00 +0000
+++ nova/db/sqlalchemy/migrate_repo/versions/033_ha_network.py	2011-07-20 18:28:31 +0000
@@ -0,0 +1,44 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2011 OpenStack, LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from sqlalchemy import Column, Table, MetaData, Boolean, String
+
+meta = MetaData()
+
+fixed_ips_host = Column('host', String(255))
+
+networks_multi_host = Column('multi_host', Boolean, default=False)
+
+
+def upgrade(migrate_engine):
+    meta.bind = migrate_engine
+
+    fixed_ips = Table('fixed_ips', meta, autoload=True)
+    fixed_ips.create_column(fixed_ips_host)
+
+    networks = Table('networks', meta, autoload=True)
+    networks.create_column(networks_multi_host)
+
+
+def downgrade(migrate_engine):
+    meta.bind = migrate_engine
+
+    fixed_ips = Table('fixed_ips', meta, autoload=True)
+    fixed_ips.drop_column(fixed_ips_host)
+
+    networks = Table('networks', meta, autoload=True)
+    networks.drop_column(networks_multi_host)
 
=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2011-07-08 03:07:58 +0000
+++ nova/db/sqlalchemy/models.py	2011-07-20 18:28:31 +0000
@@ -545,6 +545,7 @@
     injected = Column(Boolean, default=False)
     cidr = Column(String(255), unique=True)
     cidr_v6 = Column(String(255), unique=True)
+    multi_host = Column(Boolean, default=False)
 
     gateway_v6 = Column(String(255))
     netmask_v6 = Column(String(255))
@@ -603,6 +604,7 @@
     # leased means dhcp bridge has leased the ip
     leased = Column(Boolean, default=False)
     reserved = Column(Boolean, default=False)
+    host = Column(String(255))
 
 
 class FloatingIp(BASE, NovaBase):
 
=== modified file 'nova/exception.py'
--- nova/exception.py	2011-07-13 18:19:32 +0000
+++ nova/exception.py	2011-07-20 18:28:31 +0000
@@ -408,6 +408,11 @@
     message = _("Instance %(instance_id)s has zero fixed ips.")
 
 
+class FixedIpNotFoundForNetworkHost(FixedIpNotFound):
+    message = _("Network host %(host)s has zero fixed ips "
+                "in network %(network_id)s.")
+
+
 class FixedIpNotFoundForSpecificInstance(FixedIpNotFound):
     message = _("Instance %(instance_id)s doesn't have fixed ip '%(ip)s'.")
 
 
=== modified file 'nova/network/api.py'
--- nova/network/api.py	2011-07-19 20:49:05 +0000
+++ nova/network/api.py	2011-07-20 18:28:31 +0000
@@ -18,7 +18,6 @@
 
 """Handles all requests relating to instances (guest vms)."""
 
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
@@ -108,7 +107,11 @@
                                        '(%(project)s)') %
                                         {'address': floating_ip['address'],
                                         'project': context.project_id})
-        host = fixed_ip['network']['host']
+        # NOTE(vish): if we are multi_host, send to the instances host
+        if fixed_ip['network']['multi_host']:
+            host = fixed_ip['instance']['host']
+        else:
+            host = fixed_ip['network']['host']
         rpc.cast(context,
                  self.db.queue_get_for(context, FLAGS.network_topic, host),
                  {'method': 'associate_floating_ip',
@@ -123,7 +126,11 @@
             return
         if not floating_ip.get('fixed_ip'):
             raise exception.ApiError('Address is not associated.')
-        host = floating_ip['fixed_ip']['network']['host']
+        # NOTE(vish): if we are multi_host, send to the instances host
+        if floating_ip['fixed_ip']['network']['multi_host']:
+            host = floating_ip['fixed_ip']['instance']['host']
+        else:
+            host = floating_ip['fixed_ip']['network']['host']
         rpc.call(context,
                  self.db.queue_get_for(context, FLAGS.network_topic, host),
                  {'method': 'disassociate_floating_ip',
@@ -137,7 +144,9 @@
         args = kwargs
         args['instance_id'] = instance['id']
         args['project_id'] = instance['project_id']
+        args['host'] = instance['host']
         args['instance_type_id'] = instance['instance_type_id']
+
         return rpc.call(context, FLAGS.network_topic,
                         {'method': 'allocate_for_instance',
                          'args': args})
@@ -176,7 +185,8 @@
     def get_instance_nw_info(self, context, instance):
         """Returns all network info related to an instance."""
         args = {'instance_id': instance['id'],
-                'instance_type_id': instance['instance_type_id']}
+                'instance_type_id': instance['instance_type_id'],
+                'host': instance['host']}
         return rpc.call(context, FLAGS.network_topic,
                         {'method': 'get_instance_nw_info',
                          'args': args})
 
=== modified file 'nova/network/linux_net.py'
--- nova/network/linux_net.py	2011-06-27 21:48:03 +0000
+++ nova/network/linux_net.py	2011-07-20 18:28:31 +0000
@@ -497,7 +497,7 @@
         suffix = net_attrs['cidr'].rpartition('/')[2]
         out, err = _execute('sudo', 'ip', 'addr', 'add',
                             '%s/%s' %
-                            (net_attrs['gateway'], suffix),
+                            (net_attrs['dhcp_server'], suffix),
                             'brd',
                             net_attrs['broadcast'],
                             'dev',
@@ -551,21 +551,27 @@
                                              bridge)
 
 
-def get_dhcp_leases(context, network_id):
+def get_dhcp_leases(context, network_ref):
     """Return a network's hosts config in dnsmasq leasefile format."""
     hosts = []
-    for fixed_ip_ref in db.network_get_associated_fixed_ips(context,
-                                                            network_id):
-        hosts.append(_host_lease(fixed_ip_ref))
+    for fixed_ref in db.network_get_associated_fixed_ips(context,
+                                                         network_ref['id']):
+        host = fixed_ref['instance']['host']
+        if network_ref['multi_host'] and FLAGS.host != host:
+            continue
+        hosts.append(_host_lease(fixed_ref))
     return '\n'.join(hosts)
 
 
-def get_dhcp_hosts(context, network_id):
+def get_dhcp_hosts(context, network_ref):
     """Get network's hosts config in dhcp-host format."""
     hosts = []
-    for fixed_ip_ref in db.network_get_associated_fixed_ips(context,
-                                                            network_id):
-        hosts.append(_host_dhcp(fixed_ip_ref))
+    for fixed_ref in db.network_get_associated_fixed_ips(context,
+                                                         network_ref['id']):
+        host = fixed_ref['instance']['host']
+        if network_ref['multi_host'] and FLAGS.host != host:
+            continue
+        hosts.append(_host_dhcp(fixed_ref))
     return '\n'.join(hosts)
 
 
@@ -573,18 +579,16 @@
 #           configuration options (like dchp-range, vlan, ...)
 #           aren't reloaded.
 @utils.synchronized('dnsmasq_start')
-def update_dhcp(context, network_id):
+def update_dhcp(context, network_ref):
     """(Re)starts a dnsmasq server for a given network.
 
     If a dnsmasq instance is already running then send a HUP
     signal causing it to reload, otherwise spawn a new instance.
 
     """
-    network_ref = db.network_get(context, network_id)
-
     conffile = _dhcp_file(network_ref['bridge'], 'conf')
     with open(conffile, 'w') as f:
-        f.write(get_dhcp_hosts(context, network_id))
+        f.write(get_dhcp_hosts(context, network_ref))
 
     # Make sure dnsmasq can actually read it (it setuid()s to "nobody")
     os.chmod(conffile, 0644)
@@ -612,9 +616,7 @@
 
 
 @utils.synchronized('radvd_start')
-def update_ra(context, network_id):
-    network_ref = db.network_get(context, network_id)
-
+def update_ra(context, network_ref):
     conffile = _ra_file(network_ref['bridge'], 'conf')
     with open(conffile, 'w') as f:
         conf_str = """
@@ -650,9 +652,6 @@
             LOG.debug(_('Pid %d is stale, relaunching radvd'), pid)
     command = _ra_cmd(network_ref)
     _execute(*command)
-    db.network_update(context, network_id,
-                      {'gateway_v6':
-                       utils.get_my_linklocal(network_ref['bridge'])})
 
 
 def _host_lease(fixed_ip_ref):
@@ -701,10 +700,11 @@
     cmd = ['sudo', '-E', 'dnsmasq',
            '--strict-order',
            '--bind-interfaces',
+           '--interface=%s' % net['bridge'],
            '--conf-file=%s' % FLAGS.dnsmasq_config_file,
            '--domain=%s' % FLAGS.dhcp_domain,
            '--pid-file=%s' % _dhcp_file(net['bridge'], 'pid'),
-           '--listen-address=%s' % net['gateway'],
+           '--listen-address=%s' % net['dhcp_server'],
            '--except-interface=lo',
            '--dhcp-range=%s,static,120s' % net['dhcp_start'],
            '--dhcp-lease-max=%s' % len(netaddr.IPNetwork(net['cidr'])),
 
=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-07-19 19:29:44 +0000
+++ nova/network/manager.py	2011-07-20 18:28:31 +0000
@@ -28,7 +28,6 @@
 :flat_network_bridge:  Bridge device for simple network instances
 :flat_interface:  FlatDhcp will bridge into this interface if set
 :flat_network_dns:  Dns for simple network
-:flat_network_dhcp_start:  Dhcp start for FlatDhcp
 :vlan_start:  First VLAN for private networks
 :vpn_ip:  Public IP for the cloudpipe VPN servers
 :vpn_start:  First Vpn port for private networks
@@ -49,7 +48,6 @@
 import math
 import netaddr
 import socket
-import pickle
 from eventlet import greenpool
 
 from nova import context
@@ -78,8 +76,6 @@
                   'Whether to attempt to inject network setup into guest')
 flags.DEFINE_string('flat_interface', None,
                     'FlatDhcp will bridge into this interface if set')
-flags.DEFINE_string('flat_network_dhcp_start', '10.0.0.2',
-                    'Dhcp start for FlatDhcp')
 flags.DEFINE_integer('vlan_start', 100, 'First VLAN for private networks')
 flags.DEFINE_string('vlan_interface', None,
                     'vlans will bridge into this interface if set')
@@ -87,6 +83,8 @@
 flags.DEFINE_string('vpn_ip', '$my_ip',
                     'Public IP for the cloudpipe VPN servers')
 flags.DEFINE_integer('vpn_start', 1000, 'First Vpn port for private networks')
+flags.DEFINE_bool('multi_host', False,
+                  'Default value for multi_host in networks')
 flags.DEFINE_integer('network_size', 256,
                         'Number of addresses in each private subnet')
 flags.DEFINE_string('floating_range', '4.4.4.0/24',
@@ -104,7 +102,8 @@
                      'Seconds after which a deallocated ip is disassociated')
 flags.DEFINE_integer('create_unique_mac_address_attempts', 5,
                      'Number of attempts to create unique mac address')
-
+flags.DEFINE_bool('auto_assign_floating_ip', False,
+                  'Autoassigning floating ip to VM')
 flags.DEFINE_bool('use_ipv6', False,
                   'use the ipv6')
 flags.DEFINE_string('network_host', socket.gethostname(),
@@ -124,16 +123,26 @@
     used since they share code to RPC.call allocate_fixed_ip on the
     correct network host to configure dnsmasq
     """
-    def _allocate_fixed_ips(self, context, instance_id, networks, **kwargs):
+    def _allocate_fixed_ips(self, context, instance_id, host, networks,
+                            **kwargs):
         """Calls allocate_fixed_ip once for each network."""
         green_pool = greenpool.GreenPool()
 
         vpn = kwargs.pop('vpn')
         for network in networks:
-            if network['host'] != self.host:
+            # NOTE(vish): if we are not multi_host pass to the network host
+            if not network['multi_host']:
+                host = network['host']
+            # NOTE(vish): if there is no network host, set one
+            if host == None:
+                host = rpc.call(context, FLAGS.network_topic,
+                                {'method': 'set_network_host',
+                                 'args': {'network_ref': network}})
+            if host != self.host:
                 # need to call allocate_fixed_ip to correct network host
-                topic = self.db.queue_get_for(context, FLAGS.network_topic,
-                                                           network['host'])
+                topic = self.db.queue_get_for(context,
+                                              FLAGS.network_topic,
+                                              host)
                 args = {}
                 args['instance_id'] = instance_id
                 args['network_id'] = network['id']
@@ -149,12 +158,13 @@
         # wait for all of the allocates (if any) to finish
         green_pool.waitall()
 
-    def _rpc_allocate_fixed_ip(self, context, instance_id, network_id):
+    def _rpc_allocate_fixed_ip(self, context, instance_id, network_id,
+                               **kwargs):
         """Sits in between _allocate_fixed_ips and allocate_fixed_ip to
         perform network lookup on the far side of rpc.
         """
         network = self.db.network_get(context, network_id)
-        self.allocate_fixed_ip(context, instance_id, network)
+        self.allocate_fixed_ip(context, instance_id, network, **kwargs)
 
 
 class FloatingIP(object):
@@ -193,7 +203,7 @@
         # which is currently the NetworkManager version
         # do this first so fixed ip is already allocated
         ips = super(FloatingIP, self).allocate_for_instance(context, **kwargs)
-        if hasattr(FLAGS, 'auto_assign_floating_ip'):
+        if FLAGS.auto_assign_floating_ip:
             # allocate a floating ip (public_ip is just the address string)
             public_ip = self.allocate_floating_ip(context, project_id)
             # set auto_assigned column to true for the floating ip
@@ -300,15 +310,36 @@
         super(NetworkManager, self).__init__(service_name='network',
                                                 *args, **kwargs)
 
+    @utils.synchronized('get_dhcp')
+    def _get_dhcp_ip(self, context, network_ref, host=None):
+        """Get the proper dhcp address to listen on."""
+        # NOTE(vish): this is for compatibility
+        if not network_ref['multi_host']:
+            return network_ref['gateway']
+
+        if not host:
+            host = self.host
+        network_id = network_ref['id']
+        try:
+            fip = self.db.fixed_ip_get_by_network_host(context,
+                                                       network_id,
+                                                       host)
+            return fip['address']
+        except exception.FixedIpNotFoundForNetworkHost:
+            elevated = context.elevated()
+            return self.db.fixed_ip_associate_pool(elevated,
+                                                   network_id,
+                                                   host=host)
+
     def init_host(self):
         """Do any initialization that needs to be run if this is a
         standalone service.
         """
-        # Set up this host for networks in which it's already
-        # the designated network host.
+        # NOTE(vish): Set up networks for which this host already has
+        #             an ip address.
         ctxt = context.get_admin_context()
         for network in self.db.network_get_all_by_host(ctxt, self.host):
-            self._on_set_network_host(ctxt, network['id'])
+            self._setup_network(ctxt, network)
 
     def periodic_tasks(self, context=None):
         """Tasks to be run at a periodic interval."""
@@ -323,32 +354,13 @@
             if num:
                 LOG.debug(_('Dissassociated %s stale fixed ip(s)'), num)
 
-        # setup any new networks which have been created
-        self.set_network_hosts(context)
-
-    def set_network_host(self, context, network_id):
+    def set_network_host(self, context, network_ref):
         """Safely sets the host of the network."""
         LOG.debug(_('setting network host'), context=context)
         host = self.db.network_set_host(context,
-                                        network_id,
+                                        network_ref['id'],
                                         self.host)
-        if host == self.host:
-            self._on_set_network_host(context, network_id)
-
-    def set_network_hosts(self, context):
-        """Set the network hosts for any networks which are unset."""
-        try:
-            networks = self.db.network_get_all(context)
-        except exception.NoNetworksFound:
-            # no networks found, nothing to do
-            return
-
-        for network in networks:
-            host = network['host']
-            if not host:
-                # break so worker will only grab 1 (to help scale flatter)
-                self.set_network_host(context, network['id'])
-                break
+        return host
 
     def _get_networks_for_instance(self, context, instance_id, project_id):
         """Determine & return which networks an instance should connect to."""
@@ -361,9 +373,9 @@
             # we don't care if no networks are found
             pass
 
-        # return only networks which are not vlan networks and have host set
+        # return only networks which are not vlan networks
         return [network for network in networks if
-                not network['vlan'] and network['host']]
+                not network['vlan']]
 
     def allocate_for_instance(self, context, **kwargs):
         """Handles allocating the various network resources for an instance.
@@ -371,6 +383,7 @@
         rpc.called by network_api
         """
         instance_id = kwargs.pop('instance_id')
+        host = kwargs.pop('host')
         project_id = kwargs.pop('project_id')
         type_id = kwargs.pop('instance_type_id')
         vpn = kwargs.pop('vpn')
@@ -379,9 +392,11 @@
                                                             context=context)
         networks = self._get_networks_for_instance(admin_context, instance_id,
                                                                   project_id)
+        LOG.warn(networks)
         self._allocate_mac_addresses(context, instance_id, networks)
-        self._allocate_fixed_ips(admin_context, instance_id, networks, vpn=vpn)
-        return self.get_instance_nw_info(context, instance_id, type_id)
+        self._allocate_fixed_ips(admin_context, instance_id, host, networks,
+                                 vpn=vpn)
+        return self.get_instance_nw_info(context, instance_id, type_id, host)
 
     def deallocate_for_instance(self, context, **kwargs):
         """Handles deallocating various network resources for an instance.
@@ -401,7 +416,8 @@
         # deallocate vifs (mac addresses)
         self.db.virtual_interface_delete_by_instance(context, instance_id)
 
-    def get_instance_nw_info(self, context, instance_id, instance_type_id):
+    def get_instance_nw_info(self, context, instance_id,
+                             instance_type_id, host):
         """Creates network info list for instance.
 
         called by allocate_for_instance and netowrk_api
@@ -445,9 +461,16 @@
                 'cidr': network['cidr'],
                 'cidr_v6': network['cidr_v6'],
                 'injected': network['injected']}
+            if network['multi_host']:
+                dhcp_server = self._get_dhcp_ip(context, network, host)
+            else:
+                dhcp_server = self._get_dhcp_ip(context,
+                                                network,
+                                                network['host'])
             info = {
                 'label': network['label'],
                 'gateway': network['gateway'],
+                'dhcp_server': dhcp_server,
                 'broadcast': network['broadcast'],
                 'mac': vif['address'],
                 'rxtx_cap': flavor['rxtx_cap'],
@@ -487,10 +510,10 @@
                random.randint(0x00, 0xff)]
         return ':'.join(map(lambda x: "%02x" % x, mac))
 
-    def add_fixed_ip_to_instance(self, context, instance_id, network_id):
+    def add_fixed_ip_to_instance(self, context, instance_id, host, network_id):
         """Adds a fixed ip to an instance from specified network."""
         networks = [self.db.network_get(context, network_id)]
-        self._allocate_fixed_ips(context, instance_id, networks)
+        self._allocate_fixed_ips(context, instance_id, host, networks)
 
     def remove_fixed_ip_from_instance(self, context, instance_id, address):
         """Removes a fixed ip from an instance from specified network."""
@@ -517,6 +540,7 @@
         values = {'allocated': True,
                   'virtual_interface_id': vif['id']}
         self.db.fixed_ip_update(context, address, values)
+        self._setup_network(context, network)
         return address
 
     def deallocate_fixed_ip(self, context, address, **kwargs):
@@ -562,10 +586,10 @@
             #             means there will stale entries in the conf file
             #             the code below will update the file if necessary
             if FLAGS.update_dhcp_on_disassociate:
-                network = self.db.fixed_ip_get_network(context, address)
-                self.driver.update_dhcp(context, network['id'])
+                network_ref = self.db.fixed_ip_get_network(context, address)
+                self._setup_network(context, network_ref)
 
-    def create_networks(self, context, label, cidr, num_networks,
+    def create_networks(self, context, label, cidr, multi_host, num_networks,
                         network_size, cidr_v6, gateway_v6, bridge,
                         bridge_interface, **kwargs):
         """Create networks based on parameters."""
@@ -584,6 +608,7 @@
             net['bridge_interface'] = bridge_interface
             net['dns'] = FLAGS.flat_network_dns
             net['cidr'] = cidr
+            net['multi_host'] = multi_host
             net['netmask'] = str(project_net.netmask)
             net['gateway'] = str(project_net[1])
             net['broadcast'] = str(project_net.broadcast)
@@ -659,12 +684,13 @@
                                               'address': address,
                                               'reserved': reserved})
 
-    def _allocate_fixed_ips(self, context, instance_id, networks, **kwargs):
+    def _allocate_fixed_ips(self, context, instance_id, host, networks,
+                            **kwargs):
         """Calls allocate_fixed_ip once for each network."""
         raise NotImplementedError()
 
-    def _on_set_network_host(self, context, network_id):
-        """Called when this host becomes the host for a network."""
+    def _setup_network(self, context, network_ref):
+        """Sets up network on this host."""
         raise NotImplementedError()
 
     def setup_compute_network(self, context, instance_id):
@@ -706,7 +732,8 @@
 
     timeout_fixed_ips = False
 
-    def _allocate_fixed_ips(self, context, instance_id, networks, **kwargs):
+    def _allocate_fixed_ips(self, context, instance_id, host, networks,
+                            **kwargs):
         """Calls allocate_fixed_ip once for each network."""
         for network in networks:
             self.allocate_fixed_ip(context, instance_id, network)
@@ -724,12 +751,12 @@
         """
         pass
 
-    def _on_set_network_host(self, context, network_id):
-        """Called when this host becomes the host for a network."""
+    def _setup_network(self, context, network_ref):
+        """Setup Network on this host."""
         net = {}
         net['injected'] = FLAGS.flat_injected
         net['dns'] = FLAGS.flat_network_dns
-        self.db.network_update(context, network_id, net)
+        self.db.network_update(context, network_ref['id'], net)
 
 
 class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
@@ -760,30 +787,23 @@
         """
         networks = db.network_get_all_by_instance(context, instance_id)
         for network in networks:
-            self.driver.ensure_bridge(network['bridge'],
-                                      network['bridge_interface'])
-
-    def allocate_fixed_ip(self, context, instance_id, network, **kwargs):
-        """Allocate flat_network fixed_ip, then setup dhcp for this network."""
-        address = super(FlatDHCPManager, self).allocate_fixed_ip(context,
-                                                                 instance_id,
-                                                                 network)
-        if not FLAGS.fake_network:
-            self.driver.update_dhcp(context, network['id'])
-
-    def _on_set_network_host(self, context, network_id):
-        """Called when this host becomes the host for a project."""
-        net = {}
-        net['dhcp_start'] = FLAGS.flat_network_dhcp_start
-        self.db.network_update(context, network_id, net)
-        network = db.network_get(context, network_id)
-        self.driver.ensure_bridge(network['bridge'],
-                                  network['bridge_interface'],
-                                  network)
-        if not FLAGS.fake_network:
-            self.driver.update_dhcp(context, network_id)
+            if not network['multi_host']:
+                self.driver.ensure_bridge(network['bridge'],
+                                          network['bridge_interface'])
+
+    def _setup_network(self, context, network_ref):
+        """Sets up network on this host."""
+        network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref)
+        self.driver.ensure_bridge(network_ref['bridge'],
+                                  network_ref['bridge_interface'],
+                                  network_ref)
+        if not FLAGS.fake_network:
+            self.driver.update_dhcp(context, network_ref)
             if(FLAGS.use_ipv6):
-                self.driver.update_ra(context, network_id)
+                self.driver.update_ra(context, network_ref)
+                gateway = utils.get_my_linklocal(network_ref['bridge'])
+                self.db.network_update(context, network_ref['id'],
+                                       {'gateway_v6': gateway})
 
 
 class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
@@ -832,8 +852,8 @@
         values = {'allocated': True,
                   'virtual_interface_id': vif['id']}
         self.db.fixed_ip_update(context, address, values)
-        if not FLAGS.fake_network:
-            self.driver.update_dhcp(context, network['id'])
+        self._setup_network(context, network)
+        return address
 
     def add_network_to_project(self, context, project_id):
         """Force adds another network to a project."""
@@ -845,17 +865,15 @@
         """
         networks = self.db.network_get_all_by_instance(context, instance_id)
         for network in networks:
-            self.driver.ensure_vlan_bridge(network['vlan'],
-                                           network['bridge'],
-                                           network['bridge_interface'])
+            if not network['multi_host']:
+                self.driver.ensure_vlan_bridge(network['vlan'],
+                                               network['bridge'],
+                                               network['bridge_interface'])
 
     def _get_networks_for_instance(self, context, instance_id, project_id):
         """Determine which networks an instance should connect to."""
         # get networks associated with project
-        networks = self.db.project_get_networks(context, project_id)
-
-        # return only networks which have host set
-        return [network for network in networks if network['host']]
+        return self.db.project_get_networks(context, project_id)
 
     def create_networks(self, context, **kwargs):
         """Create networks based on parameters."""
@@ -874,32 +892,35 @@
 
         NetworkManager.create_networks(self, context, vpn=True, **kwargs)
 
-    def _on_set_network_host(self, context, network_id):
-        """Called when this host becomes the host for a network."""
-        network = self.db.network_get(context, network_id)
-        if not network['vpn_public_address']:
+    def _setup_network(self, context, network_ref):
+        """Sets up network on this host."""
+        network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref)
+        if not network_ref['vpn_public_address']:
             net = {}
             address = FLAGS.vpn_ip
             net['vpn_public_address'] = address
-            db.network_update(context, network_id, net)
+            network_ref = db.network_update(context, network_ref['id'], net)
         else:
-            address = network['vpn_public_address']
-        self.driver.ensure_vlan_bridge(network['vlan'],
-                                       network['bridge'],
-                                       network['bridge_interface'],
-                                       network)
+            address = network_ref['vpn_public_address']
+        self.driver.ensure_vlan_bridge(network_ref['vlan'],
+                                       network_ref['bridge'],
+                                       network_ref['bridge_interface'],
+                                       network_ref)
 
         # NOTE(vish): only ensure this forward if the address hasn't been set
         #             manually.
         if address == FLAGS.vpn_ip and hasattr(self.driver,
                                                "ensure_vlan_forward"):
             self.driver.ensure_vlan_forward(FLAGS.vpn_ip,
-                                            network['vpn_public_port'],
-                                            network['vpn_private_address'])
+                                            network_ref['vpn_public_port'],
+                                            network_ref['vpn_private_address'])
         if not FLAGS.fake_network:
-            self.driver.update_dhcp(context, network_id)
+            self.driver.update_dhcp(context, network_ref)
             if(FLAGS.use_ipv6):
-                self.driver.update_ra(context, network_id)
+                self.driver.update_ra(context, network_ref)
+                gateway = utils.get_my_linklocal(network_ref['bridge'])
+                self.db.network_update(context, network_ref['id'],
+                                       {'gateway_v6': gateway})
 
     @property
     def _bottom_reserved_ips(self):
 
=== modified file 'nova/tests/__init__.py'
--- nova/tests/__init__.py	2011-06-29 17:58:10 +0000
+++ nova/tests/__init__.py	2011-07-20 18:28:31 +0000
@@ -59,6 +59,7 @@
     network.create_networks(ctxt,
                             label='test',
                             cidr=FLAGS.fixed_range,
+                            multi_host=FLAGS.multi_host,
                             num_networks=FLAGS.num_networks,
                             network_size=FLAGS.network_size,
                             cidr_v6=FLAGS.fixed_range_v6,
@@ -68,7 +69,7 @@
                             vpn_start=FLAGS.vpn_start,
                             vlan_start=FLAGS.vlan_start)
     for net in db.network_get_all(ctxt):
-        network.set_network_host(ctxt, net['id'])
+        network.set_network_host(ctxt, net)
 
     cleandb = os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db)
     shutil.copyfile(testdb, cleandb)
 
=== modified file 'nova/tests/test_libvirt.py'
--- nova/tests/test_libvirt.py	2011-06-28 16:20:02 +0000
+++ nova/tests/test_libvirt.py	2011-07-20 18:28:31 +0000
@@ -58,6 +58,7 @@
                'cidr': fake_ip,
                'cidr_v6': fake_ip}
     mapping = {'mac': fake,
+               'dhcp_server': fake,
                'gateway': fake,
                'gateway6': fake,
                'ips': [{'ip': fake_ip}, {'ip': fake_ip}]}
 
=== modified file 'nova/tests/test_network.py'
--- nova/tests/test_network.py	2011-07-11 14:49:34 +0000
+++ nova/tests/test_network.py	2011-07-20 18:28:31 +0000
@@ -45,6 +45,7 @@
 networks = [{'id': 0,
              'label': 'test0',
              'injected': False,
+             'multi_host': False,
              'cidr': '192.168.0.0/24',
              'cidr_v6': '2001:db8::/64',
              'gateway_v6': '2001:db8::1',
@@ -62,6 +63,7 @@
             {'id': 1,
              'label': 'test1',
              'injected': False,
+             'multi_host': False,
              'cidr': '192.168.1.0/24',
              'cidr_v6': '2001:db9::/64',
              'gateway_v6': '2001:db9::1',
@@ -122,20 +124,6 @@
         self.network = network_manager.FlatManager(host=HOST)
         self.network.db = db
 
-    def test_set_network_hosts(self):
-        self.mox.StubOutWithMock(db, 'network_get_all')
-        self.mox.StubOutWithMock(db, 'network_set_host')
-        self.mox.StubOutWithMock(db, 'network_update')
-
-        db.network_get_all(mox.IgnoreArg()).AndReturn([networks[0]])
-        db.network_set_host(mox.IgnoreArg(),
-                            networks[0]['id'],
-                            mox.IgnoreArg()).AndReturn(HOST)
-        db.network_update(mox.IgnoreArg(), mox.IgnoreArg(), mox.IgnoreArg())
-        self.mox.ReplayAll()
-
-        self.network.set_network_hosts(None)
-
     def test_get_instance_nw_info(self):
         self.mox.StubOutWithMock(db, 'fixed_ip_get_by_instance')
         self.mox.StubOutWithMock(db, 'virtual_interface_get_by_instance')
@@ -149,7 +137,7 @@
                                    mox.IgnoreArg()).AndReturn(flavor)
         self.mox.ReplayAll()
 
-        nw_info = self.network.get_instance_nw_info(None, 0, 0)
+        nw_info = self.network.get_instance_nw_info(None, 0, 0, None)
 
         self.assertTrue(nw_info)
 
@@ -164,6 +152,7 @@
             self.assertDictMatch(nw[0], check)
 
             check = {'broadcast': '192.168.%s.255' % i,
+                     'dhcp_server': '192.168.%s.1' % i,
                      'dns': 'DONTCARE',
                      'gateway': '192.168.%s.1' % i,
                      'gateway6': '2001:db%s::1' % i8,
 
=== modified file 'nova/virt/libvirt/connection.py'
--- nova/virt/libvirt/connection.py	2011-07-20 16:17:44 +0000
+++ nova/virt/libvirt/connection.py	2011-07-20 18:28:31 +0000
@@ -928,7 +928,6 @@
 
     def _get_nic_for_xml(self, network, mapping):
         # Assume that the gateway also acts as the dhcp server.
-        dhcp_server = mapping['gateway']
         gateway6 = mapping.get('gateway6')
         mac_id = mapping['mac'].replace(':', '')
 
@@ -951,7 +950,7 @@
             'bridge_name': network['bridge'],
             'mac_address': mapping['mac'],
             'ip_address': mapping['ips'][0]['ip'],
-            'dhcp_server': dhcp_server,
+            'dhcp_server': mapping['dhcp_server'],
             'extra_params': extra_params,
         }