Merge lp:~reldan/nova/l-m-n-fix-network-info into lp:~openstack-gd/nova/libvirt-multinic-nova

[Eldar Nugaev]

[Ilya Alekseyev (ilyaalekseyev)]

lgtm

review: Approve

=== 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-23 21:38:23 +0000
@@ -785,7 +785,8 @@
 
         instance_ref = db.instance_create(self.context,
                                           {'user_id': 'fake',
-                                          'project_id': 'fake'})
+                                          'project_id': 'fake',
+                                          'mac_address': '00:A0:C9:14:C8:29'})
         inst_id = instance_ref['id']
 
         ip = '10.11.12.13'

=== modified file 'nova/utils.py'
--- nova/utils.py	2011-03-17 21:11:58 +0000
+++ nova/utils.py	2011-03-23 21:38:23 +0000
@@ -309,11 +309,15 @@
 
 
 def to_global_ipv6(prefix, mac):
-    mac64 = netaddr.EUI(mac).eui64().words
-    int_addr = int(''.join(['%02x' % i for i in mac64]), 16)
-    mac64_addr = netaddr.IPAddress(int_addr)
-    maskIP = netaddr.IPNetwork(prefix).ip
-    return (mac64_addr ^ netaddr.IPAddress('::0200:0:0:0') | maskIP).format()
+    try:
+        mac64 = netaddr.EUI(mac).eui64().words
+        int_addr = int(''.join(['%02x' % i for i in mac64]), 16)
+        mac64_addr = netaddr.IPAddress(int_addr)
+        maskIP = netaddr.IPNetwork(prefix).ip
+        return (mac64_addr ^ netaddr.IPAddress('::0200:0:0:0') | maskIP).\
+        format()
+    except TypeError:
+        raise TypeError(_("Bad mac for to_global_ipv6: %s" % mac))
 
 
 def to_mac(ipv6_address):

=== modified file 'nova/virt/libvirt_conn.py'
--- nova/virt/libvirt_conn.py	2011-03-23 19:08:22 +0000
+++ nova/virt/libvirt_conn.py	2011-03-23 21:38:23 +0000
@@ -757,7 +757,7 @@
         if FLAGS.libvirt_type == 'uml':
             utils.execute('sudo', 'chown', 'root', basepath('disk'))
 
-    def _get_nic_for_xml(self, instance_id, network, mapping):
+    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']
@@ -802,8 +802,6 @@
         return result
 
     def to_xml(self, instance, rescue=False, network_info=None):
-        admin_context = context.get_admin_context()
-
         # TODO(termie): cache?
         LOG.debug(_('instance %s: starting toXML method'), instance['name'])
 
@@ -814,8 +812,7 @@
 
         nics = []
         for (network, mapping) in network_info:
-            nics.append(self._get_nic_for_xml(instance['id'],
-                                              network,
+            nics.append(self._get_nic_for_xml(network,
                                               mapping))
         # FIXME(vish): stick this in db
         instance_type_name = instance['instance_type']
@@ -1392,16 +1389,6 @@
         """
         raise NotImplementedError()
 
-    def _gateway_v6_for_instance(self, instance):
-        network = db.network_get_by_instance(context.get_admin_context(),
-                                             instance['id'])
-        return network['gateway_v6']
-
-    def _all_gateway_v6_for_instance(self, instance):
-        networks = db.network_get_all_by_instance(context.get_admin_context(),
-                                                  instance['id'])
-        return [network['gateway_v6'] for network in networks]
-
 
 class NWFilterFirewall(FirewallDriver):
     """
@@ -1604,6 +1591,8 @@
         it makes sure the filters for the security groups as well as
         the base filter are all in place.
         """
+        if not network_info:
+            network_info = _get_network_info(instance)
         if instance['image_id'] == FLAGS.vpn_image_id:
             base_filter = 'nova-vpn'
         else:
@@ -1616,7 +1605,8 @@
                                              'nova-base-ipv6',
                                              'nova-allow-dhcp-server']
         if FLAGS.use_ipv6:
-            gateways_v6 = self._all_gateway_v6_for_instance(instance)
+            gateways_v6 = [network['gateway_v6'] for (network, _) in
+                           network_info]
             if gateways_v6:
                 instance_secgroup_filter_children += ['nova-allow-ra-server']
 
@@ -1803,7 +1793,8 @@
         # they're not worth the clutter.
         if FLAGS.use_ipv6:
             # Allow RA responses
-            gateways_v6 = self._all_gateway_v6_for_instance(instance)
+            gateways_v6 = [network['gateway_v6'] for (network, _) in
+                           network_info]
             for gateway_v6 in gateways_v6:
                 ipv6_rules.append(
                         '-s %s/128 -p icmpv6 -j ACCEPT' % (gateway_v6,))
@@ -1896,31 +1887,3 @@
 
     def _instance_chain_name(self, instance):
         return 'inst-%s' % (instance['id'],)
-
-    def _ip_for_instance(self, instance):
-        return db.instance_get_fixed_address(context.get_admin_context(),
-                                             instance['id'])
-
-    def _ip_for_instance_v6(self, instance):
-        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 _gateway_v6_for_instance(self, instance):
-        network = db.network_get_by_instance(context.get_admin_context(),
-                                             instance['id'])
-        return network['gateway_v6']
-
-    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']