some libvirt multi-nic just to get it to work, from tushar

5 files changed, 37 insertions, 27 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 3cb35b649..0187f7bc6 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -827,12 +827,14 @@ def virtual_interface_create(context, values):
 
 
 @require_context
-def virtual_interface_get(context, vif_id):
+def virtual_interface_get(context, vif_id, session=None):
     """Gets a virtual interface from the table.
 
     :param vif_id: = id of the virtual interface
     """
-    session = get_session()
+    if not session:
+        session = get_session()
+
     vif_ref = session.query(models.VirtualInterface).\
                       filter_by(id=vif_id).\
                       options(joinedload('network')).\
@@ -927,8 +929,8 @@ def virtual_interface_delete(context, vif_id):
 
     :param vif_id: = id of vif to delete
     """
-    vif_ref = virtual_interface_get(context, vif_id)
     session = get_session()
+    vif_ref = virtual_interface_get(context, vif_id, session)
     with session.begin():
         # disassociate any fixed_ips from this interface
         for fixed_ip in vif_ref['fixed_ips']:
@@ -945,7 +947,7 @@ def virtual_interface_delete_by_instance(context, instance_id):
     """
     vif_refs = virtual_interface_get_by_instance(context, instance_id)
     for vif_ref in vif_refs:
-        virtual_interface_delete(vif_ref['id'])
+        virtual_interface_delete(context, vif_ref['id'])
 
 
 ###################
diff --git a/nova/network/manager.py b/nova/network/manager.py
index f51738643..1a5afb454 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -423,6 +423,8 @@ class NetworkManager(manager.SchedulerDependentManager):
             network_dict = {
                 'bridge': network['bridge'],
                 'id': network['id'],
+                'cidr': network['cidr'],
+                'cidr_v6': network['cidr_v6'],
                 'injected': network['injected']}
             info = {
                 'label': network['label'],
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 96ef92825..9016933d6 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -771,8 +771,6 @@ class LibvirtConnection(driver.ComputeDriver):
     def _create_image(self, inst, libvirt_xml, suffix='', disk_images=None,
                         network_info=None, block_device_mapping=None):
         block_device_mapping = block_device_mapping or []
-        if not network_info:
-            network_info = netutils.get_network_info(inst)
 
         if not suffix:
             suffix = ''
@@ -881,18 +879,20 @@ class LibvirtConnection(driver.ComputeDriver):
 
             have_injected_networks = True
             address = mapping['ips'][0]['ip']
+            netmask = mapping['ips'][0]['netmask']
             address_v6 = None
             if FLAGS.use_ipv6:
                 address_v6 = mapping['ip6s'][0]['ip']
+                netmask_v6 = mapping['ip6s'][0]['netmask']
             net_info = {'name': 'eth%d' % ifc_num,
                    'address': address,
-                   'netmask': network_ref['netmask'],
-                   'gateway': network_ref['gateway'],
-                   'broadcast': network_ref['broadcast'],
-                   'dns': network_ref['dns'],
+                   'netmask': netmask,
+                   'gateway': mapping['gateway'],
+                   'broadcast': mapping['broadcast'],
+                   'dns': mapping['dns'],
                    'address_v6': address_v6,
-                   'gateway_v6': network_ref['gateway_v6'],
-                   'netmask_v6': network_ref['netmask_v6']}
+                   'gateway6': mapping['gateway6'],
+                   'netmask_v6': netmask_v6}
             nets.append(net_info)
 
         if have_injected_networks:
@@ -928,8 +928,8 @@ class LibvirtConnection(driver.ComputeDriver):
 
     def _get_nic_for_xml(self, network, mapping):
         # Assume that the gateway also acts as the dhcp server.
-        dhcp_server = network['gateway']
-        gateway_v6 = network['gateway_v6']
+        dhcp_server = mapping['gateway']
+        gateway6 = mapping.get('gateway6')
         mac_id = mapping['mac'].replace(':', '')
 
         if FLAGS.allow_project_net_traffic:
@@ -955,8 +955,8 @@ class LibvirtConnection(driver.ComputeDriver):
             'extra_params': extra_params,
         }
 
-        if gateway_v6:
-            result['gateway_v6'] = gateway_v6 + "/128"
+        if gateway6:
+            result['gateway6'] = gateway6 + "/128"
 
         return result
 
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index 84153fa1e..d990d6f15 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -543,7 +543,7 @@ class IptablesFirewallDriver(FirewallDriver):
         ipv4_rules += ['-m state --state ESTABLISHED,RELATED -j ACCEPT']
         ipv6_rules += ['-m state --state ESTABLISHED,RELATED -j ACCEPT']
 
-        dhcp_servers = [network['gateway'] for (network, _m) in network_info]
+        dhcp_servers = [info['gateway'] for (_n, info) in network_info]
 
         for dhcp_server in dhcp_servers:
             ipv4_rules.append('-s %s -p udp --sport 67 --dport 68 '
@@ -560,7 +560,7 @@ class IptablesFirewallDriver(FirewallDriver):
         # they're not worth the clutter.
         if FLAGS.use_ipv6:
             # Allow RA responses
-            gateways_v6 = [network['gateway_v6'] for (network, _) in
+            gateways_v6 = [mapping['gateway6'] for (_n, mapping) in
                            network_info]
             for gateway_v6 in gateways_v6:
                 ipv6_rules.append(
@@ -568,8 +568,8 @@ class IptablesFirewallDriver(FirewallDriver):
 
             #Allow project network traffic
             if FLAGS.allow_project_net_traffic:
-                cidrv6s = [network['cidr_v6'] for (network, _m)
-                          in network_info]
+                cidrv6s = [network['cidr_v6'] for (network, _m) in
+                           network_info]
 
                 for cidrv6 in cidrv6s:
                     ipv6_rules.append('-s %s -j ACCEPT' % (cidrv6,))
diff --git a/nova/virt/libvirt/netutils.py b/nova/virt/libvirt/netutils.py
index c8c2dbc67..773f0a09c 100644
--- a/nova/virt/libvirt/netutils.py
+++ b/nova/virt/libvirt/netutils.py
@@ -49,30 +49,36 @@ def get_ip_version(cidr):
 
 
 def get_network_info(instance):
+    # TODO(tr3buchet): this function needs to go away! network info
+    #                  MUST be passed down from compute
     # TODO(adiantum) If we will keep this function
     # we should cache network_info
     admin_context = context.get_admin_context()
 
-    ip_addresses = db.fixed_ip_get_by_instance(admin_context, instance['id'])
+    fixed_ips = db.fixed_ip_get_by_instance(admin_context, instance['id'])
+    vifs = db.virtual_interface_get_by_instance(admin_context, instance['id'])
     networks = db.network_get_all_by_instance(admin_context,
                                               instance['id'])
     flavor = db.instance_type_get_by_id(admin_context,
                                         instance['instance_type_id'])
     network_info = []
 
-    for network in networks:
-        network_ips = [ip for ip in ip_addresses
-                       if ip['network_id'] == network['id']]
+    for vif in vifs:
+        network = vif['network']
+
+        # determine which of the instance's IPs belong to this network
+        network_ips = [fixed_ip['address'] for fixed_ip in fixed_ips if
+                       fixed_ip['network_id'] == network['id']]
 
         def ip_dict(ip):
             return {
-                'ip': ip['address'],
+                'ip': ip,
                 'netmask': network['netmask'],
                 'enabled': '1'}
 
         def ip6_dict():
             prefix = network['cidr_v6']
-            mac = instance['mac_address']
+            mac = vif['address']
             project_id = instance['project_id']
             return  {
                 'ip': ipv6.to_global(prefix, mac, project_id),
@@ -83,7 +89,7 @@ def get_network_info(instance):
             'label': network['label'],
             'gateway': network['gateway'],
             'broadcast': network['broadcast'],
-            'mac': instance['mac_address'],
+            'mac': vif['address'],
             'rxtx_cap': flavor['rxtx_cap'],
             'dns': [network['dns']],
             'ips': [ip_dict(ip) for ip in network_ips]}