Merge lp:~jk0/nova/xs-ipv6 into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Enable IPv6 injection for XenServer instances. Added addressV6, netmaskV6 and gatewayV6 columns to the fixed_ips table via migration #007 as per NTT FlatManager IPv6 spec.

[Sandy Walsh (sandy-walsh)]

Nothing to complain about here.

review: Approve

[Trey Morris (tr3buchet)]

looks just fine to me. I didn't pay much attention to the migration but i'm guessing it isn't why you requested my review.

review: Approve

[Matt Dietz (cerberus)]

lgtm.

review: Approve

[Tushar Patil (tpatil)]

There is a slight change in the flatmanager design for IPV6 and I want to bring to your notice the changes we are planning from the initial design.

Database Changes:
1) Renaming ra_server column to gateway_v6 from networks db table. When we (NTT) implemented IPv6 support for VlanManager and FlatDHCPManager in Bexar, we added new ra_server column in the networks database table. However now we think that ra_server name is not suitable naming.Because with all of 3 network models, there are some routers as gateway which forwards the packets between inside and outside of the cloud. And only with VlanManager or FlatDHCPManager, those routers advertises RA messages. Then in generally, those routers should be called as not "RA server" but just "gateway".
So we are planning to rename ra_server column to gateway_v6.
2) Adding netmask_v6 column to the networks db table.
3) We are not adding new addressV6 column to the fixed_ips. Please take a note of this.
  Reason: IPv6 address will be calculated from MAC address a we are doing it in case of all of Vlan, FlatDHCP.

This is the first time, we have come across such dependency and I know you will have to do lot of rework. Sorry for that. Please let us know if you want to know more about our design changes.
Please check-out our branch at https://code.launchpad.net/~ntt-pf-lab/nova/flatmanager-ipv6 for more information. The development is still in progress.

=== added file 'nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py'
--- nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py	1970-01-01 00:00:00 +0000
+++ nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py	2011-03-02 22:52:14 +0000
@@ -0,0 +1,90 @@
+# Copyright 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 *
+from migrate import *
+
+from nova import log as logging
+
+
+meta = MetaData()
+
+
+# Table stub-definitions
+# Just for the ForeignKey and column creation to succeed, these are not the
+# actual definitions of instances or services.
+#
+fixed_ips = Table(
+    "fixed_ips",
+    meta,
+    Column(
+        "id",
+        Integer(),
+        primary_key=True,
+        nullable=False))
+
+#
+# New Tables
+#
+# None
+
+#
+# Tables to alter
+#
+# None
+
+#
+# Columns to add to existing tables
+#
+
+fixed_ips_addressV6 = Column(
+    "addressV6",
+    String(
+        length=255,
+        convert_unicode=False,
+        assert_unicode=None,
+        unicode_error=None,
+        _warn_on_bytestring=False))
+
+
+fixed_ips_netmaskV6 = Column(
+    "netmaskV6",
+    String(
+        length=3,
+        convert_unicode=False,
+        assert_unicode=None,
+        unicode_error=None,
+        _warn_on_bytestring=False))
+
+
+fixed_ips_gatewayV6 = Column(
+    "gatewayV6",
+    String(
+        length=255,
+        convert_unicode=False,
+        assert_unicode=None,
+        unicode_error=None,
+        _warn_on_bytestring=False))
+
+
+def upgrade(migrate_engine):
+    # Upgrade operations go here. Don't create your own engine;
+    # bind migrate_engine to your metadata
+    meta.bind = migrate_engine
+
+    # Add columns to existing tables
+    fixed_ips.create_column(fixed_ips_addressV6)
+    fixed_ips.create_column(fixed_ips_netmaskV6)
+    fixed_ips.create_column(fixed_ips_gatewayV6)

=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2011-02-24 05:47:29 +0000
+++ nova/db/sqlalchemy/models.py	2011-03-02 22:52:14 +0000
@@ -437,6 +437,9 @@
     allocated = Column(Boolean, default=False)
     leased = Column(Boolean, default=False)
     reserved = Column(Boolean, default=False)
+    addressV6 = Column(String(255))
+    netmaskV6 = Column(String(3))
+    gatewayV6 = Column(String(255))
 
 
 class User(BASE, NovaBase):

=== modified file 'nova/virt/xenapi/vmops.py'
--- nova/virt/xenapi/vmops.py	2011-02-25 16:47:08 +0000
+++ nova/virt/xenapi/vmops.py	2011-03-02 22:52:14 +0000
@@ -514,18 +514,30 @@
             network_IPs = [ip for ip in IPs if ip.network_id == network.id]
 
             def ip_dict(ip):
-                return {'netmask': network['netmask'],
-                        'enabled': '1',
-                        'ip': ip.address}
+                return {
+                    "ip": ip.address,
+                    "netmask": network["netmask"],
+                    "enabled": "1"}
+
+            def ip6_dict(ip6):
+                return {
+                    "ip": ip6.addressV6,
+                    "netmask": ip6.netmaskV6,
+                    "gateway": ip6.gatewayV6,
+                    "enabled": "1"}
 
             mac_id = instance.mac_address.replace(':', '')
             location = 'vm-data/networking/%s' % mac_id
-            mapping = {'label': network['label'],
-                       'gateway': network['gateway'],
-                       'mac': instance.mac_address,
-                       'dns': [network['dns']],
-                       'ips': [ip_dict(ip) for ip in network_IPs]}
+            mapping = {
+                'label': network['label'],
+                'gateway': network['gateway'],
+                'mac': instance.mac_address,
+                'dns': [network['dns']],
+                'ips': [ip_dict(ip) for ip in network_IPs],
+                'ip6s': [ip6_dict(ip) for ip in network_IPs]}
+
             self.write_to_param_xenstore(vm_opaque_ref, {location: mapping})
+
             try:
                 self.write_to_xenstore(vm_opaque_ref, location,
                                                       mapping['location'])