Merge lp:~ilyaalekseyev/nova/libvirt-multinic-experemental into lp:~openstack-gd/nova/multi-nic-exp-fix

[Eldar Nugaev]

[Ilya Alekseyev (ilyaalekseyev)]

review: Abstain

Unmerged revisions

716. By Ilya Alekseyev on 2011-03-15

merge with reldan tests and fixes

715. By Ilya Alekseyev on 2011-03-15

bugfix

714. By Ilya Alekseyev on 2011-03-15

bugfix

713. By Ilya Alekseyev on 2011-03-14

fixed ip lease and release & floating ips getter

712. By Ilya Alekseyev on 2011-03-14

bug & test fix

711. By Ilya Alekseyev on 2011-03-14

bug & test fix

710. By Ilya Alekseyev on 2011-03-13

Merge with trunk and bugfix

709. By Ilya Alekseyev on 2011-03-13

model migration

708. By Ilya Alekseyev on 2011-03-10

Merge with trunk

707. By Ilya Alekseyev on 2011-03-10

fixing merge trouble

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-03-16 17:06:30 +0000
+++ bin/nova-manage	2011-03-17 13:48:33 +0000
@@ -555,6 +555,11 @@
                                 network.dhcp_start,
                                 network.dns)
 
+
+    def associate(self, project_id, cidr):
+        """Associate network with project"""
+        db.network_associate(context.get_admin_context(), project_id, cidr)
+
     def delete(self, fixed_range):
         """Deletes a network"""
         network = db.network_get_by_cidr(context.get_admin_context(), \

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-03-15 21:56:00 +0000
+++ nova/compute/api.py	2011-03-17 13:48:33 +0000
@@ -213,12 +213,20 @@
         instances = []
         LOG.debug(_("Going to run %s instances..."), num_instances)
         for num in range(num_instances):
-            instance = dict(mac_address=utils.generate_mac(),
+            instance = dict(#mac_address=utils.generate_mac(),
                             launch_index=num,
                             **base_options)
             instance = self.db.instance_create(context, instance)
             instance_id = instance['id']
 
+            networks = self.db.network_get_all_by_project(context,
+                                                          context.project_id)
+            for net in networks:
+                nic = dict(mac_address=utils.generate_mac(),
+                           instance_id=instance_id,
+                           network_id=net.id)
+                self.db.nic_create(context, nic)
+
             elevated = context.elevated()
             if not security_groups:
                 security_groups = []
@@ -611,4 +619,4 @@
     def associate_floating_ip(self, context, instance_id, address):
         instance = self.get(context, instance_id)
         self.network_api.associate_floating_ip(context, address,
-                                               instance['fixed_ip'])
+                                               instance['fixed_ip'][0])

=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2011-03-15 21:56:00 +0000
+++ nova/compute/manager.py	2011-03-17 13:48:33 +0000
@@ -199,11 +199,17 @@
         #             a call to ensure that network setup completes.  We
         #             will eventually also need to save the address here.
         if not FLAGS.stub_network:
-            address = rpc.call(context,
-                               self.get_network_topic(context),
-                               {"method": "allocate_fixed_ip",
-                                "args": {"instance_id": instance_id,
-                                         "vpn": is_vpn}})
+            #address = rpc.call(context,
+            #                   self.get_network_topic(context),
+            #                   {"method": "allocate_fixed_ip",
+            #                    "args": {"instance_id": instance_id,
+            #                             "vpn": is_vpn}})
+
+            addresses = rpc.call(context,
+                                 self.get_network_topic(context),
+                                 {"method": "allocate_fixed_ips",
+                                  "args":{"instance_id": instance_id,
+                                          "vpn": is_vpn}})
 
             self.network_manager.setup_compute_network(context,
                                                        instance_id)
@@ -237,8 +243,8 @@
         instance_ref = self.db.instance_get(context, instance_id)
         LOG.audit(_("Terminating instance %s"), instance_id, context=context)
 
-        fixed_ip = instance_ref.get('fixed_ip')
-        if not FLAGS.stub_network and fixed_ip:
+        fixed_ips = instance_ref.get('fixed_ips')
+        if not FLAGS.stub_network and fixed_ips:
             floating_ips = fixed_ip.get('floating_ips') or []
             for floating_ip in floating_ips:
                 address = floating_ip['address']
@@ -255,15 +261,16 @@
                          {"method": "disassociate_floating_ip",
                           "args": {"floating_address": address}})
 
-            address = fixed_ip['address']
-            if address:
-                LOG.debug(_("Deallocating address %s"), address,
-                          context=context)
-                # NOTE(vish): Currently, nothing needs to be done on the
-                #             network node until release. If this changes,
-                #             we will need to cast here.
-                self.network_manager.deallocate_fixed_ip(context.elevated(),
-                                                         address)
+            for fixed_ip in fixed_ips:
+                address = fixed_ip['address']
+                if address:
+                    LOG.debug(_("Deallocating address %s"), address,
+                              context=context)
+                    # NOTE(vish): Currently, nothing needs to be done on the
+                    #             network node until release. If this changes,
+                    #             we will need to cast here.
+                    self.network_manager.deallocate_fixed_ip(context.elevated(),
+                                                             address)
 
         volumes = instance_ref.get('volumes') or []
         for volume in volumes:

=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-03-15 07:45:35 +0000
+++ nova/db/api.py	2011-03-17 13:48:33 +0000
@@ -435,13 +435,13 @@
     return IMPL.instance_get_all_by_reservation(context, reservation_id)
 
 
-def instance_get_fixed_address(context, instance_id):
+def instance_get_fixed_address(context, instance_id, network_id):
     """Get the fixed ip address of an instance."""
-    return IMPL.instance_get_fixed_address(context, instance_id)
-
-
-def instance_get_fixed_address_v6(context, instance_id):
-    return IMPL.instance_get_fixed_address_v6(context, instance_id)
+    return IMPL.instance_get_fixed_address(context, instance_id, network_id)
+
+
+def instance_get_fixed_address_v6(context, instance_id, network_id):
+    return IMPL.instance_get_fixed_address_v6(context, instance_id, network_id)
 
 
 def instance_get_floating_address(context, instance_id):
@@ -541,9 +541,9 @@
 ####################
 
 
-def network_associate(context, project_id):
+def network_associate(context, project_id, cidr=None):
     """Associate a free network to a project."""
-    return IMPL.network_associate(context, project_id)
+    return IMPL.network_associate(context, project_id, cidr)
 
 
 def network_count(context):
@@ -633,6 +633,9 @@
     """Get all networks by instance id or raise if none exist."""
     return IMPL.network_get_all_by_instance(context, instance_id)
 
+def network_get_all_by_project(context, project_id):
+    return IMPL.network_get_all_by_project(context, project_id)
+
 
 def network_get_index(context, network_id):
     """Get non-conflicting index for network."""
@@ -1171,3 +1174,19 @@
 def zone_get_all(context):
     """Get all child Zones."""
     return IMPL.zone_get_all(context)
+
+
+####################
+
+
+def nic_create(context, nic):
+    """Create new network interface card"""
+    return IMPL.nic_create(context, nic)
+
+def nic_get_by_network_and_instance(context, instance_id, network_id):
+    """Get network interface card by instance and network"""
+    return IMPL.nic_get_by_network_and_instance(context,
+                                                instance_id,
+                                                network_id)
+def nic_get_all(context):
+    return IMPL.nic_get_all(context)
\ No newline at end of file

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-03-15 07:45:35 +0000
+++ nova/db/sqlalchemy/api.py	2011-03-17 13:48:33 +0000
@@ -29,10 +29,12 @@
 from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy.session import get_session
 from sqlalchemy import or_
+from sqlalchemy import not_
 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 select
 from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import literal_column
 
@@ -730,6 +732,7 @@
     mac = utils.to_mac(address)
 
     result = session.query(models.Instance).\
+                     join(models.Instance.mac_address).\
                      filter_by(mac_address=mac).\
                      first()
     return result
@@ -751,9 +754,36 @@
         fixed_ip_ref.update(values)
         fixed_ip_ref.save(session=session)
 
-
-###################
-
+###################
+
+@require_context
+def nic_create(context, values):
+    """Create a new NIC for instance"""
+
+    nic_ref = models.NetworkInterfaceCard()
+    nic_ref.update(values)
+
+    session = get_session()
+    with session.begin():
+        nic_ref.save(session=session)
+    return nic_ref
+
+@require_context
+def nic_get_by_network_and_instance(context, instance_id, network_id):
+    session = get_session()
+    nic = session.query(models.NetworkInterfaceCard).\
+                 filter_by(instance_id=instance_id).\
+                 filter_by(network_id=network_id).\
+                 filter_by(deleted=False).\
+                 first()
+    return nic
+
+@require_context
+def nic_get_all(context):
+    session = get_session()
+    return session.query(models.NetworkInterfaceCard)
+
+###################
 
 @require_context
 def instance_create(context, values):
@@ -763,11 +793,36 @@
     values - dict containing column values.
     """
     instance_ref = models.Instance()
+    mac_addresses = None
+    networks=[None]
+    if values.get('mac_address'):
+        if type(values['mac_address']).__name__ == 'str':
+            mac_addresses = [values['mac_address']]
+        elif type(values['mac_address']).__name__ == 'list':
+            mac_addresses = values['mac_address']
+        del values['mac_address']
+        networks = networks * len(mac_addresses)
+
+    if values.get('networks'):
+        if type(values['networks']).__name__ == 'list':
+            networks = values['networks']
+        else:
+            networks = [values['networks']]
+        del values['networks']
     instance_ref.update(values)
 
     session = get_session()
     with session.begin():
         instance_ref.save(session=session)
+        if mac_addresses:
+            for i in range(0, len(mac_addresses)):
+                mac_address = mac_addresses[i]
+                network_id = networks[i]
+                nic = models.NetworkInterfaceCard()
+                nic.update({'instance_id': instance_ref['id'],
+                            'mac_address': mac_address,
+                            'network_id': network_id})
+                nic.save(session=session)
     return instance_ref
 
 
@@ -797,6 +852,11 @@
                 update({'deleted': 1,
                         'deleted_at': datetime.datetime.utcnow(),
                         'updated_at': literal_column('updated_at')})
+        session.query(models.NetworkInterfaceCard).\
+                filter_by(instance_id=instance_id).\
+                update({'deleted': 1,
+                        'deleted_at': datetime.datetime.utcnow(),
+                        'updated_at': literal_column('updated_at')})
 
 
 @require_context
@@ -918,23 +978,29 @@
 
 
 @require_context
-def instance_get_fixed_address(context, instance_id):
+def instance_get_fixed_address(context, instance_id, network_id):
     session = get_session()
-    with session.begin():
-        instance_ref = instance_get(context, instance_id, session=session)
-        if not instance_ref.fixed_ip:
-            return None
-        return instance_ref.fixed_ip['address']
+    fixed_ip_ref = session.query(models.FixedIp).\
+                            filter_by(id=instance_id).\
+                            filter_by(network_id=network_id).\
+                            first()
+    if fixed_ip_ref is None:
+        return None
+
+    return fixed_ip_ref['address']
 
 
 @require_context
-def instance_get_fixed_address_v6(context, instance_id):
+def instance_get_fixed_address_v6(context, instance_id, network_id):
     session = get_session()
     with session.begin():
         instance_ref = instance_get(context, instance_id, session=session)
-        network_ref = network_get_by_instance(context, instance_id)
+        #network_ref = network_get_by_instance(context, instance_id)
+        network_ref = network_get(context, network_id, session)
         prefix = network_ref.cidr_v6
-        mac = instance_ref.mac_address
+        nic = nic_get_by_network_and_instance(context, network_id=network_id,
+                                              instance_id=instance_id)
+        mac = nic.mac_address
         return utils.to_global_ipv6(prefix, mac)
 
 
@@ -945,10 +1011,15 @@
         instance_ref = instance_get(context, instance_id, session=session)
         if not instance_ref.fixed_ip:
             return None
-        if not instance_ref.fixed_ip.floating_ips:
+        floating_ips = []
+        for ip in instance_ref.fixed_ip:
+            if ip.floating_ips:
+                floating_ips.extend(ip.floating_ips)
+
+        if len(floating_ips) == 0:
             return None
         # NOTE(vish): this just returns the first floating ip
-        return instance_ref.fixed_ip.floating_ips[0]['address']
+        return floating_ips[0]['address']
 
 
 @require_admin_context
@@ -1115,21 +1186,42 @@
 ###################
 
 
-@require_admin_context
-def network_associate(context, project_id):
+@require_context
+def network_associate(context, project_id, cidr=None):
     session = get_session()
     with session.begin():
-        network_ref = session.query(models.Network).\
-                               filter_by(deleted=False).\
-                               filter_by(project_id=None).\
-                               with_lockmode('update').\
-                               first()
-        # NOTE(vish): if with_lockmode isn't supported, as in sqlite,
-        #             then this has concurrency issues
-        if not network_ref:
-            raise db.NoMoreNetworks()
-        network_ref['project_id'] = project_id
+        if cidr is None:
+            network_ref = session.query(models.Network).\
+                                   filter_by(deleted=False).\
+                                   filter_by(project_id=None).\
+                                   filter(not_(models.
+                                    Network.id.in_(select([models.
+                                    NetworkProjectAssociation.network_id])))).\
+                                   with_lockmode('update').\
+                                   first()
+            # NOTE(vish): if with_lockmode isn't supported, as in sqlite,
+            #             then this has concurrency issues
+            if not network_ref:
+                raise db.NoMoreNetworks()
+        else:
+            network_ref = session.query(models.Network).\
+                            filter_by(deleted=False).\
+                            filter_by(project_id=None).\
+                            filter_by(cidr=cidr).\
+                            with_lockmode('update').\
+                            first()
+
+            if not network_ref:
+                raise  db.NoMoreNetworks()
+
+        if cidr is None and not network_ref['project_id']:
+            network_ref['project_id'] = project_id
+
+        association = models.NetworkProjectAssociation()
+        association.project_id=project_id
+        association.network_id=network_ref['id']
         session.add(network_ref)
+        session.add(association)
     return network_ref
 
 
@@ -1232,7 +1324,7 @@
 @require_admin_context
 def network_get_all(context):
     session = get_session()
-    result = session.query(models.Network)
+    result = session.query(models.Network).all()
     if not result:
         raise exception.NotFound(_('No networks defined'))
     return result
@@ -1284,7 +1376,7 @@
     session = get_session()
     rv = session.query(models.Network).\
                  filter_by(deleted=False).\
-                 join(models.Network.fixed_ips).\
+                 join(models.Network.fixed_ip).\
                  filter_by(instance_id=instance_id).\
                  filter_by(deleted=False).\
                  first()
@@ -1292,19 +1384,33 @@
         raise exception.NotFound(_('No network for instance %s') % instance_id)
     return rv
 
-
 @require_admin_context
 def network_get_all_by_instance(_context, instance_id):
     session = get_session()
     rv = session.query(models.Network).\
                  filter_by(deleted=False).\
-                 join(models.Network.fixed_ips).\
+                 join(models.Network.fixed_ip).\
                  filter_by(instance_id=instance_id).\
                  filter_by(deleted=False)
     if not rv:
         raise exception.NotFound(_('No network for instance %s') % instance_id)
     return rv
 
+@require_context
+def network_get_all_by_project(context, project_id):
+    session = get_session()
+    nets = session.query(models.Network).\
+                filter_by(deleted=False).\
+                filter_by(project_id=None).\
+                join(models.Network.projects).\
+                filter_by(id=project_id).\
+                filter_by(deleted=False).\
+                all()
+    if len(nets) == 0:
+        nets=[project_get_network(context, project_id)]
+
+    return nets
+
 
 @require_admin_context
 def network_set_host(context, network_id, host_id):
@@ -2313,7 +2419,7 @@
     return result
 
 
-    ##################
+####################
 
 
 @require_admin_context

=== added file 'nova/db/sqlalchemy/migrate_repo/versions/011_add_multinic_tables.py'
--- nova/db/sqlalchemy/migrate_repo/versions/011_add_multinic_tables.py	1970-01-01 00:00:00 +0000
+++ nova/db/sqlalchemy/migrate_repo/versions/011_add_multinic_tables.py	2011-03-17 13:48:33 +0000
@@ -0,0 +1,93 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 Ilya Alekseyev.
+# 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 *
+
+from sqlalchemy import *
+from migrate import *
+
+from nova import log as logging
+
+meta = MetaData()
+
+# Just for the ForeignKey and column creation to succeed.
+instances = Table('instances', meta,
+                  Column('id', Integer(),  primary_key=True, nullable=False),
+                  Column('mac_address', String(255))
+            )
+
+networks = Table('networks', meta,
+                 Column('id', Integer(), primary_key=True, nullable=False)
+            )
+
+projects = Table('projects', meta,
+        Column('id',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False),
+               primary_key=True,
+               nullable=False)
+        )
+
+# Tables for creation
+
+network_interface_cards = Table('network_interface_cards', meta,
+                Column('created_at', DateTime(timezone=False)),
+                Column('updated_at', DateTime(timezone=False)),
+                Column('deleted_at', DateTime(timezone=False)),
+                Column('deleted', Boolean(create_constraint=True, name=None)),
+                Column('id', Integer(), primary_key=True),
+                Column('instance_id', Integer(), ForeignKey('instances.id')),
+                Column('network_id', Integer(), ForeignKey('networks.id')),
+                Column('mac_address', String(255))
+)
+
+network_project_association = Table('project_network_association', meta,
+                Column('created_at', DateTime(timezone=False)),
+                Column('updated_at', DateTime(timezone=False)),
+                Column('deleted_at', DateTime(timezone=False)),
+                Column('deleted', Boolean(create_constraint=True, name=None)),
+                Column('project_id', String(255), ForeignKey('projects.id'),
+                       primary_key=True, nullable=True),
+                Column('network_id', Integer(), ForeignKey('networks.id'),
+                       primary_key=True, nullable=True),
+)
+
+
+def upgrade(migrate_engine):
+    # Upgrade operations go here. Don't create your own engine; bind migrate_engine
+    # to your metadata
+    meta.bind = migrate_engine
+    for table in [network_interface_cards, network_project_association]:
+        try:
+            table.create()
+        except Exception:
+            logging.info(repr(table))
+            logging.exception('Exception while creating table')
+            meta.drop_all(tables=tables)
+            raise
+
+
+def downgrade(migrate_engine):
+    # Operations to reverse the above upgrade go here.
+    meta.bind = migrate_engine
+    for table in [network_interface_cards, network_project_association]:
+        try:
+            table.drop()
+        except Exception:
+            logging.info(repr(table))
+            logging.exception('Exception while creating table')
+            meta.drop_all(tables=tables)
+            raise
+

=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2011-03-15 21:56:00 +0000
+++ nova/db/sqlalchemy/models.py	2011-03-17 13:48:33 +0000
@@ -22,7 +22,7 @@
 import datetime
 
 from sqlalchemy.orm import relationship, backref, object_mapper
-from sqlalchemy import Column, Integer, String, schema
+from sqlalchemy import Column, Integer, Float, String, schema
 from sqlalchemy import ForeignKey, DateTime, Boolean, Text
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declarative_base
@@ -214,7 +214,7 @@
     user_data = Column(Text)
 
     reservation_id = Column(String(255))
-    mac_address = Column(String(255))
+    #mac_address = Column(String(255))
 
     scheduled_at = Column(DateTime)
     launched_at = Column(DateTime)
@@ -245,6 +245,21 @@
     #                     'shutdown', 'shutoff', 'crashed'])
 
 
+class InstanceDiagnostics(BASE, NovaBase):
+    """Represents a guest VM's diagnostics"""
+    __tablename__ = "instance_diagnostics"
+    id = Column(Integer, primary_key=True)
+    instance_id = Column(Integer, ForeignKey('instances.id'))
+
+    memory_available = Column(Float)
+    memory_free = Column(Float)
+    cpu_load = Column(Float)
+    disk_read = Column(Float)
+    disk_write = Column(Float)
+    net_tx = Column(Float)
+    net_rx = Column(Float)
+
+
 class InstanceActions(BASE, NovaBase):
     """Represents a guest VM's actions and results"""
     __tablename__ = "instance_actions"
@@ -497,10 +512,10 @@
     id = Column(Integer, primary_key=True)
     address = Column(String(255))
     network_id = Column(Integer, ForeignKey('networks.id'), nullable=True)
-    network = relationship(Network, backref=backref('fixed_ips'))
+    network = relationship(Network, backref=backref('fixed_ip'))
     instance_id = Column(Integer, ForeignKey('instances.id'), nullable=True)
     instance = relationship(Instance,
-                            backref=backref('fixed_ip', uselist=False),
+                            backref=backref('fixed_ip'),
                             foreign_keys=instance_id,
                             primaryjoin='and_('
                                 'FixedIp.instance_id == Instance.id,'
@@ -537,6 +552,9 @@
     members = relationship(User,
                            secondary='user_project_association',
                            backref='projects')
+    networks = relationship(Network,
+                            secondary='project_network_association',
+                            backref='projects')
 
 
 class UserProjectRoleAssociation(BASE, NovaBase):
@@ -560,6 +578,23 @@
                           'user_project_association.project_id'])
 
 
+class NetworkInterfaceCard(BASE, NovaBase):
+    """Represents a guest VM's NIC's"""
+    __tablename__ = "network_interface_cards"
+    id = Column(Integer, primary_key=True)
+    instance_id = Column(Integer, ForeignKey('instances.id'))
+    instance = relationship(Instance, backref=backref('mac_address'))
+    mac_address = Column(String(255))
+    network_id = Column(Integer, ForeignKey('networks.id'))
+
+
+class NetworkProjectAssociation(BASE, NovaBase):
+    """Represents network to project association"""
+    __tablename__ = "project_network_association"
+    project_id = Column(String(255), ForeignKey(Project.id), primary_key=True)
+    network_id = Column(Integer, ForeignKey(Network.id),primary_key=True)
+
+
 class UserRoleAssociation(BASE, NovaBase):
     __tablename__ = 'user_role_association'
     user_id = Column(String(255), ForeignKey('users.id'), primary_key=True)

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-03-09 18:16:26 +0000
+++ nova/network/manager.py	2011-03-17 13:48:33 +0000
@@ -223,11 +223,17 @@
         LOG.debug(_("Leasing IP %s"), address, context=context)
         fixed_ip_ref = self.db.fixed_ip_get_by_address(context, address)
         instance_ref = fixed_ip_ref['instance']
+        network_ref = fixed_ip_ref['network']
         if not instance_ref:
             raise exception.Error(_("IP %s leased that isn't associated") %
                                   address)
-        if instance_ref['mac_address'] != mac:
-            inst_addr = instance_ref['mac_address']
+        if not network_ref:
+            raise exception.Error(_("IP %s leased that isn't in network") %
+                                  address)
+        macs = [x.mac_address for x in instance_ref['mac_address']
+                if x.network_id == network_ref['id']]
+        if len(macs) != 0 and macs[0] != mac:
+            inst_addr = macs[0]
             raise exception.Error(_("IP %(address)s leased to bad"
                     " mac %(inst_addr)s vs %(mac)s") % locals())
         now = datetime.datetime.utcnow()
@@ -244,11 +250,17 @@
         LOG.debug(_("Releasing IP %s"), address, context=context)
         fixed_ip_ref = self.db.fixed_ip_get_by_address(context, address)
         instance_ref = fixed_ip_ref['instance']
+        network_ref = fixed_ip_ref['network']
         if not instance_ref:
             raise exception.Error(_("IP %s released that isn't associated") %
                                   address)
-        if instance_ref['mac_address'] != mac:
-            inst_addr = instance_ref['mac_address']
+        if not network_ref:
+            raise exception.Error(_("IP %s leased that isn't in network") %
+                                  address)
+        macs = [x.mac_address for x in instance_ref['mac_address']
+                if x.network_id == network_ref['id']]
+        if len(macs) != 0 and macs[0] != mac:
+            inst_addr = macs[0]
             raise exception.Error(_("IP %(address)s released from"
                     " bad mac %(inst_addr)s vs %(mac)s") % locals())
         if not fixed_ip_ref['leased']:
@@ -489,6 +501,29 @@
         super(VlanManager, self).init_host()
         self.driver.metadata_forward()
 
+    def allocate_fixed_ips(self, context, instance_id, *args, **kwargs):
+        """Gets a fixed ips from the pool"""
+        ctxt = context.elevated()
+        project_id = context.project_id
+        network_refs = self.db.network_get_all_by_project(ctxt,
+                                                          context.project_id)
+        addresses = []
+        for network_ref in network_refs:
+            if kwargs.get('vpn', None):
+                address = network_ref['vpn_private_address']
+                self.db.fixed_ip_associate(ctxt,
+                                           address,
+                                           instance_id)
+            else:
+                address = self.db.fixed_ip_associate_pool(ctxt,
+                                                          network_ref['id'],
+                                                          instance_id)
+            self.db.fixed_ip_update(context, address, {'allocated': True})
+            if not FLAGS.fake_network:
+                self.driver.update_dhcp(context, network_ref['id'])
+            addresses.append(address)
+        return addresses
+
     def allocate_fixed_ip(self, context, instance_id, *args, **kwargs):
         """Gets a fixed ip from the pool."""
         # TODO(vish): This should probably be getting project_id from
@@ -517,9 +552,12 @@
 
     def setup_compute_network(self, context, instance_id):
         """Sets up matching network for compute hosts."""
-        network_ref = db.network_get_by_instance(context, instance_id)
-        self.driver.ensure_vlan_bridge(network_ref['vlan'],
-                                       network_ref['bridge'])
+        #network_ref = db.network_get_by_instance(context, instance_id)
+        network_refs = db.network_get_all_by_instance(context, instance_id)
+        for network_ref in network_refs:
+            self.driver.ensure_vlan_bridge(network_ref['vlan'],
+                                           network_ref['bridge'])
+
 
     def create_networks(self, context, cidr, num_networks, network_size,
                         cidr_v6, vlan_start, vpn_start, **kwargs):

=== modified file 'nova/tests/test_cloud.py'
--- nova/tests/test_cloud.py	2011-03-11 16:55:28 +0000
+++ nova/tests/test_cloud.py	2011-03-17 13:48:33 +0000
@@ -367,7 +367,7 @@
         self.cloud.update_instance(self.context, inst['id'],
                                    mac_address='DE:AD:BE:EF')
         inst = db.instance_get(self.context, inst['id'])
-        self.assertEqual(None, inst['mac_address'])
+        self.assertEqual([], inst['mac_address'])
         db.instance_destroy(self.context, inst['id'])
 
     def test_update_of_volume_display_fields(self):

=== modified file 'nova/tests/test_compute.py'
--- nova/tests/test_compute.py	2011-03-14 22:17:00 +0000
+++ nova/tests/test_compute.py	2011-03-17 13:48:33 +0000
@@ -77,7 +77,7 @@
         inst['user_id'] = self.user.id
         inst['project_id'] = self.project.id
         inst['instance_type'] = 'm1.tiny'
-        inst['mac_address'] = utils.generate_mac()
+        inst['mac_address'] = [utils.generate_mac()]
         inst['ami_launch_index'] = 0
         inst.update(params)
         return db.instance_create(self.context, inst)['id']

=== modified file 'nova/tests/test_console.py'
--- nova/tests/test_console.py	2011-03-07 01:25:01 +0000
+++ nova/tests/test_console.py	2011-03-17 13:48:33 +0000
@@ -63,7 +63,7 @@
         inst['user_id'] = self.user.id
         inst['project_id'] = self.project.id
         inst['instance_type'] = 'm1.tiny'
-        inst['mac_address'] = utils.generate_mac()
+        inst['mac_address'] = [utils.generate_mac()]
         inst['ami_launch_index'] = 0
         return db.instance_create(self.context, inst)['id']
 

=== modified file 'nova/tests/test_network.py'
--- nova/tests/test_network.py	2011-03-14 13:21:44 +0000
+++ nova/tests/test_network.py	2011-03-17 13:48:33 +0000
@@ -214,7 +214,7 @@
         self.manager.delete_user(self.user)
         super(NetworkTestCase, self).tearDown()
 
-    def _create_instance(self, project_num, mac=None):
+    def _create_instance(self, project_num, mac=None, network_id=None):
         if not mac:
             mac = utils.generate_mac()
         project = self.projects[project_num]
@@ -222,7 +222,8 @@
         self.context.project_id = project.id
         return db.instance_create(self.context,
                                   {'project_id': project.id,
-                                   'mac_address': mac})
+                                   'mac_address': mac,
+                                   'networks': network_id})
 
     def _create_address(self, project_num, instance_id=None):
         """Create an address in given project num"""
@@ -237,27 +238,67 @@
         self.context.project_id = self.projects[project_num].id
         self.network.deallocate_fixed_ip(self.context, address)
 
+    def test_multi_nic(self):
+        """Makes sure network_associate works"""
+        project_id = self.context.project_id
+        ctxt = context.get_admin_context()
+
+        before_all_net_count = len(db.network_get_all(ctxt))
+        before_proj_net_count = len(db.network_get_all_by_project(ctxt,
+                                                                  project_id))
+        additional_net_count = 1
+        self.network.create_networks(ctxt, '11.0.0.0/8', additional_net_count,
+                                     FLAGS.network_size,
+                                     FLAGS.fixed_range_v6,
+                                     FLAGS.vlan_start,
+                                     FLAGS.vpn_start,)
+
+        after_all_networks = db.network_get_all(ctxt)
+        after_all_networks_count = len(after_all_networks)
+        self.assertEqual(before_all_net_count + additional_net_count,
+                         after_all_networks_count)
+
+        expected_count = 0
+
+        for net in after_all_networks:
+            if not net.project_id:
+                expected_count += 1
+                db.network_associate(ctxt, project_id, net.cidr)
+        self.assertTrue(expected_count > 0)
+        
+        after_proj_net_count = len(db.network_get_all_by_project(ctxt,
+                                                                 project_id))
+
+        self.assertEquals(after_proj_net_count,
+                          before_proj_net_count + expected_count)
+
     def test_private_ipv6(self):
         """Make sure ipv6 is OK"""
         if FLAGS.use_ipv6:
-            instance_ref = self._create_instance(0)
-            address = self._create_address(0, instance_ref['id'])
             network_ref = db.project_get_network(
                                                  context.get_admin_context(),
                                                  self.context.project_id)
+            instance_ref = self._create_instance(0,
+                                                 network_id=network_ref['id'])
+            address = self._create_address(0, instance_ref['id'])
             address_v6 = db.instance_get_fixed_address_v6(
                                                  context.get_admin_context(),
-                                                 instance_ref['id'])
-            self.assertEqual(instance_ref['mac_address'],
-                             utils.to_mac(address_v6))
+                                                 instance_ref['id'],
+                                                 network_ref['id'])
             instance_ref2 = db.fixed_ip_get_instance_v6(
                                                  context.get_admin_context(),
                                                  address_v6)
             self.assertEqual(instance_ref['id'], instance_ref2['id'])
+            nic = db.\
+                nic_get_by_network_and_instance(context.get_admin_context(),
+                        network_id=network_ref['id'],
+                        instance_id=instance_ref['id'])
+            self.assertEqual(nic['mac_address'],
+                             utils.to_mac(address_v6))
             self.assertEqual(address_v6,
                              utils.to_global_ipv6(
-                                                 network_ref['cidr_v6'],
-                                                 instance_ref['mac_address']))
+                                network_ref['cidr_v6'],
+                                nic['mac_address']))
             self._deallocate_address(0, address)
             db.instance_destroy(context.get_admin_context(),
                                 instance_ref['id'])
@@ -512,8 +553,10 @@
     instance_ref = db.fixed_ip_get_instance(context.get_admin_context(),
                                             private_ip)
     cmd = (binpath('nova-dhcpbridge'), 'add',
-           instance_ref['mac_address'],
-           private_ip, 'fake')
+           instance_ref['mac_address'][0]['mac_address'],
+           private_ip, 'fake',
+           '--sql_connection=sqlite://%s/tests.sqlite'
+           % os.path.dirname(binpath('')))
     env = {'DNSMASQ_INTERFACE': network_ref['bridge'],
            'TESTING': '1',
            'FLAGFILE': FLAGS.dhcpbridge_flagfile}
@@ -529,7 +572,9 @@
                                             private_ip)
     cmd = (binpath('nova-dhcpbridge'), 'del',
            instance_ref['mac_address'],
-           private_ip, 'fake')
+           private_ip, 'fake',
+           '--sql_connection=sqlite://%s/tests.sqlite'
+           % os.path.dirname(binpath('')))
     env = {'DNSMASQ_INTERFACE': network_ref['bridge'],
            'TESTING': '1',
            'FLAGFILE': FLAGS.dhcpbridge_flagfile}

=== modified file 'nova/tests/test_quota.py'
--- nova/tests/test_quota.py	2011-03-15 21:56:00 +0000
+++ nova/tests/test_quota.py	2011-03-17 13:48:33 +0000
@@ -69,7 +69,7 @@
         inst['project_id'] = self.project.id
         inst['instance_type'] = 'm1.large'
         inst['vcpus'] = cores
-        inst['mac_address'] = utils.generate_mac()
+        inst['mac_address'] = [utils.generate_mac()]
         return db.instance_create(self.context, inst)['id']
 
     def _create_volume(self, size=10):

=== modified file 'nova/tests/test_virt.py'
--- nova/tests/test_virt.py	2011-03-14 17:59:41 +0000
+++ nova/tests/test_virt.py	2011-03-17 13:48:33 +0000
@@ -560,14 +560,16 @@
     ]
 
     def test_static_filters(self):
+        ip = '10.11.12.13'
+
+        network_ref = db.project_get_network(self.context,
+                                             'fake')
+
         instance_ref = db.instance_create(self.context,
                                           {'user_id': 'fake',
                                           'project_id': 'fake',
-                                          'mac_address': '56:12:12:12:12:12'})
-        ip = '10.11.12.13'
-
-        network_ref = db.project_get_network(self.context,
-                                             'fake')
+                                          'mac_address': '56:12:12:12:12:12',
+                                          'networks': network_ref['id']})
 
         fixed_ip = {'address': ip,
                     'network_id': network_ref['id']}

=== modified file 'nova/virt/libvirt.xml.template'
--- nova/virt/libvirt.xml.template	2011-01-21 11:04:02 +0000
+++ nova/virt/libvirt.xml.template	2011-03-17 13:48:33 +0000
@@ -69,22 +69,24 @@
         </disk>
     #end if
 #end if
+
+#for $nic in $nics
         <interface type='bridge'>
-            <source bridge='${bridge_name}'/>
-            <mac address='${mac_address}'/>
+            <source bridge='$nic.bridge_name'/>
+            <mac address='$nic.mac_address'/>
             <!--   <model type='virtio'/>  CANT RUN virtio network right now -->
-            <filterref filter="nova-instance-${name}">
-                <parameter name="IP" value="${ip_address}" />
-                <parameter name="DHCPSERVER" value="${dhcp_server}" />           
+            <filterref filter="nova-instance-$nic.name">
+                <parameter name="IP" value="$nic.ip_address" />
+                <parameter name="DHCPSERVER" value="$nic.dhcp_server" />
 #if $getVar('extra_params', False)
-                ${extra_params}
+                $nic.extra_params
 #end if
 #if $getVar('ra_server', False)
-                <parameter name="RASERVER" value="${ra_server}" />
+                <parameter name="RASERVER" value="$nic.ra_server" />
 #end if
             </filterref>
         </interface>
-
+#end for
         <!-- The order is significant here.  File must be defined first -->
         <serial type="file">
             <source path='${basepath}/console.log'/>

=== modified file 'nova/virt/libvirt_conn.py'
--- nova/virt/libvirt_conn.py	2011-03-16 19:26:41 +0000
+++ nova/virt/libvirt_conn.py	2011-03-17 13:48:33 +0000
@@ -693,41 +693,59 @@
     def to_xml(self, instance, rescue=False):
         # TODO(termie): cache?
         LOG.debug(_('instance %s: starting toXML method'), instance['name'])
-        network = db.network_get_by_instance(context.get_admin_context(),
+        networks = db.network_get_all_by_instance(context.get_admin_context(),
                                              instance['id'])
-        # FIXME(vish): stick this in db
         instance_type = instance['instance_type']
-        # instance_type = test.INSTANCE_TYPES[instance_type]
+        #instance_type = instance_types.INSTANCE_TYPES[instance_type]
         instance_type = instance_types.get_instance_type(instance_type)
-        ip_address = db.instance_get_fixed_address(context.get_admin_context(),
-                                                   instance['id'])
-        # Assume that the gateway also acts as the dhcp server.
-        dhcp_server = network['gateway']
-        ra_server = network['ra_server']
-
-        if FLAGS.allow_project_net_traffic:
-            if FLAGS.use_ipv6:
-                net, mask = _get_net_and_mask(network['cidr'])
-                net_v6, prefixlen_v6 = _get_net_and_prefixlen(
-                                           network['cidr_v6'])
-                extra_params = ("<parameter name=\"PROJNET\" "
-                            "value=\"%s\" />\n"
-                            "<parameter name=\"PROJMASK\" "
-                            "value=\"%s\" />\n"
-                            "<parameter name=\"PROJNETV6\" "
-                            "value=\"%s\" />\n"
-                            "<parameter name=\"PROJMASKV6\" "
-                            "value=\"%s\" />\n") % \
-                              (net, mask, net_v6, prefixlen_v6)
+
+        nics = []
+        for network in networks:
+            # FIXME(vish): stick this in db
+            ip_address = db.instance_get_fixed_address(
+                            context.get_admin_context(),
+                            instance['id'], network['id'])
+            mac_address = db.\
+                nic_get_by_network_and_instance(context.get_admin_context(),
+                                                             instance['id'],
+                                                             network['id'])
+            # Assume that the gateway also acts as the dhcp server.
+            dhcp_server = network['gateway']
+            ra_server = network['ra_server']
+            if ra_server:
+                ra_server = ra_server + "/128"
+
+            if FLAGS.allow_project_net_traffic:
+                if FLAGS.use_ipv6:
+                    net, mask = _get_net_and_mask(network['cidr'])
+                    net_v6, prefixlen_v6 = _get_net_and_prefixlen(
+                                               network['cidr_v6'])
+                    extra_params = ("<parameter name=\"PROJNET\" "
+                                "value=\"%s\" />\n"
+                                "<parameter name=\"PROJMASK\" "
+                                "value=\"%s\" />\n"
+                                "<parameter name=\"PROJNETV6\" "
+                                "value=\"%s\" />\n"
+                                "<parameter name=\"PROJMASKV6\" "
+                                "value=\"%s\" />\n") % \
+                                  (net, mask, net_v6, prefixlen_v6)
+                else:
+                    net, mask = _get_net_and_mask(network['cidr'])
+                    extra_params = ("<parameter name=\"PROJNET\" "
+                                "value=\"%s\" />\n"
+                                "<parameter name=\"PROJMASK\" "
+                                "value=\"%s\" />\n") % \
+                                  (net, mask)
             else:
-                net, mask = _get_net_and_mask(network['cidr'])
-                extra_params = ("<parameter name=\"PROJNET\" "
-                            "value=\"%s\" />\n"
-                            "<parameter name=\"PROJMASK\" "
-                            "value=\"%s\" />\n") % \
-                              (net, mask)
-        else:
-            extra_params = "\n"
+                extra_params = "\n"
+            nic = dict(ip_address=ip_address, mac_address=mac_address,
+                       dhcp_server=dhcp_server, ra_server=ra_server,
+                       net=net, mask=mask, net_v6=net_v6,
+                       prefixlen_v6=prefixlen_v6, extra_params=extra_params,
+                       bridge_name=network['bridge'],
+                       name=('%s-%s' % (instance['id'], network['id'])))
+            nics.append(nic)
+
         if FLAGS.use_cow_images:
             driver_type = 'qcow2'
         else:
@@ -739,17 +757,18 @@
                                              instance['name']),
                     'memory_kb': instance_type['memory_mb'] * 1024,
                     'vcpus': instance_type['vcpus'],
-                    'bridge_name': network['bridge'],
-                    'mac_address': instance['mac_address'],
-                    'ip_address': ip_address,
-                    'dhcp_server': dhcp_server,
-                    'extra_params': extra_params,
+                    #'bridge_name': network['bridge'],
+                    #'mac_address': instance['mac_address'],
+                    #'ip_address': ip_address,
+                    #'dhcp_server': dhcp_server,
+                    #'extra_params': extra_params,
+                    'nics': nics,
                     'rescue': rescue,
                     'local': instance_type['local_gb'],
                     'driver_type': driver_type}
 
-        if ra_server:
-            xml_info['ra_server'] = ra_server + "/128"
+#        if ra_server:
+#            xml_info['ra_server'] = ra_server + "/128"
         if not rescue:
             if instance['kernel_id']:
                 xml_info['kernel'] = xml_info['basepath'] + "/kernel"
@@ -762,7 +781,6 @@
         xml = str(Template(self.libvirt_xml, searchList=[xml_info]))
         LOG.debug(_('instance %s: finished toXML method'),
                         instance['name'])
-
         return xml
 
     def get_info(self, instance_name):
@@ -1626,18 +1644,22 @@
         chain_name = self._instance_chain_name(instance)
 
         self.iptables.ipv4['filter'].add_chain(chain_name)
-        ipv4_address = self._ip_for_instance(instance)
-        self.iptables.ipv4['filter'].add_rule('local',
-                                              '-d %s -j $%s' %
-                                              (ipv4_address, chain_name))
+        networks = db.network_get_all_by_instance(context.get_admin_context(),
+                                                  instance['id'])
+        for network in networks:
+            ipv4_address = self._ip_for_instance(instance, network)
+            self.iptables.ipv4['filter'].add_rule('local',
+                                                  '-d %s -j $%s' %
+                                                  (ipv4_address, chain_name))
 
         if FLAGS.use_ipv6:
             self.iptables.ipv6['filter'].add_chain(chain_name)
-            ipv6_address = self._ip_for_instance_v6(instance)
-            self.iptables.ipv6['filter'].add_rule('local',
-                                                  '-d %s -j $%s' %
-                                                  (ipv6_address,
-                                                   chain_name))
+            for network in networks:
+                ipv6_address = self._ip_for_instance_v6(instance, network)
+                self.iptables.ipv6['filter'].add_rule('local',
+                                                      '-d %s -j $%s' %
+                                                      (ipv6_address,
+                                                       chain_name))
 
         ipv4_rules, ipv6_rules = self.instance_rules(instance)
 
@@ -1669,28 +1691,31 @@
         ipv4_rules += ['-m state --state ESTABLISHED,RELATED -j ACCEPT']
         ipv6_rules += ['-m state --state ESTABLISHED,RELATED -j ACCEPT']
 
-        dhcp_server = self._dhcp_server_for_instance(instance)
-        ipv4_rules += ['-s %s -p udp --sport 67 --dport 68 '
-                       '-j ACCEPT' % (dhcp_server,)]
+        dhcp_servers = self._dhcp_servers_for_instance(instance)
+        for dhcp_server in dhcp_servers:
+            ipv4_rules += ['-s %s -p udp --sport 67 --dport 68 '
+                           '-j ACCEPT' % (dhcp_server,)]
 
         #Allow project network traffic
         if FLAGS.allow_project_net_traffic:
-            cidr = self._project_cidr_for_instance(instance)
-            ipv4_rules += ['-s %s -j ACCEPT' % (cidr,)]
+            cidrs = self._project_cidrs_for_instance(instance)
+            for cidr in cidrs:
+                ipv4_rules += ['-s %s -j ACCEPT' % (cidr,)]
 
         # We wrap these in FLAGS.use_ipv6 because they might cause
         # a DB lookup. The other ones are just list operations, so
         # they're not worth the clutter.
         if FLAGS.use_ipv6:
             # Allow RA responses
-            ra_server = self._ra_server_for_instance(instance)
-            if ra_server:
+            ra_servers = self._ra_servers_for_instance(instance)
+            for ra_server in ra_servers:
                 ipv6_rules += ['-s %s/128 -p icmpv6 -j ACCEPT' % (ra_server,)]
 
             #Allow project network traffic
             if FLAGS.allow_project_net_traffic:
-                cidrv6 = self._project_cidrv6_for_instance(instance)
-                ipv6_rules += ['-s %s -j ACCEPT' % (cidrv6,)]
+                cidrs_v6 = self._project_cidrs_v6_for_instance(instance)
+                for cidr_v6 in cidrs_v6:
+                    ipv6_rules += ['-s %s -j ACCEPT' % (cidr_v6,)]
 
         security_groups = db.security_group_get_by_instance(ctxt,
                                                             instance['id'])
@@ -1773,30 +1798,27 @@
     def _instance_chain_name(self, instance):
         return 'inst-%s' % (instance['id'],)
 
-    def _ip_for_instance(self, instance):
+    def _ip_for_instance(self, instance, network):
         return db.instance_get_fixed_address(context.get_admin_context(),
-                                             instance['id'])
+                                             instance['id'], network['id'])
 
-    def _ip_for_instance_v6(self, instance):
+    def _ip_for_instance_v6(self, instance, network):
         return db.instance_get_fixed_address_v6(context.get_admin_context(),
-                                             instance['id'])
-
-    def _dhcp_server_for_instance(self, instance):
-        network = db.network_get_by_instance(context.get_admin_context(),
-                                             instance['id'])
-        return network['gateway']
-
-    def _ra_server_for_instance(self, instance):
-        network = db.network_get_by_instance(context.get_admin_context(),
-                                             instance['id'])
-        return network['ra_server']
-
-    def _project_cidr_for_instance(self, instance):
-        network = db.network_get_by_instance(context.get_admin_context(),
-                                             instance['id'])
-        return network['cidr']
-
-    def _project_cidrv6_for_instance(self, instance):
-        network = db.network_get_by_instance(context.get_admin_context(),
-                                             instance['id'])
-        return network['cidr_v6']
+                                             instance['id'], network['id'])
+
+    def _network_field_for_instance(self, instance, field):
+        networks = db.network_get_all_by_instance(context.get_admin_context(),
+                                             instance['id'])
+        return [network[field] for network in networks]
+
+    def _dhcp_servers_for_instance(self, instance):
+        return self._network_field_for_instance(instance, 'gateway')
+
+    def _ra_servers_for_instance(self, instance):
+        return self._network_field_for_instance(instance, 'ra_server')
+
+    def _project_cidrs_for_instance(self, instance):
+        return self._network_field_for_instance(instance, 'cidr')
+
+    def _project_cidrs_v6_for_instance(self, instance):
+        return self._network_field_for_instance(instance, 'cidr_v6')
\ No newline at end of file