Merge lp:~rackspace-titan/nova/osapi-ipv6-lp798457 into lp:~hudson-openstack/nova/trunk

[Brian Waldon]

- Add 'fixed_ipv6' property to VirtualInterface model
- Expose ipv6 addresses in each network in OSAPI v1.1

[lp:~rackspace-titan/nova/osapi-ipv6-lp798457]

1286. By Brian Waldon on 2011-07-19

respecting use_ipv6 flag if set to False

[Jason Kölker (jason-koelker)]

Is bueno.

I'm not a fan of the different treatment of IPv4 vs IPv6, but that's just nova in general right now ;).

review: Approve

[Vish Ishaya (vishvananda)]

nice. LGTM

review: Approve

[Trey Morris (tr3buchet)]

other than the fact that we're writing this in such a way that it would be difficult to pluralize ipv6_address in the future (a symptom shared with all of nova) this is great.

review: Approve

[Brian Lamar (blamar)]

review: Approve

=== modified file 'nova/api/openstack/views/addresses.py'
--- nova/api/openstack/views/addresses.py	2011-07-14 18:23:23 +0000
+++ nova/api/openstack/views/addresses.py	2011-07-19 13:40:32 +0000
@@ -15,9 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from nova import flags
 from nova import utils
 from nova.api.openstack import common
 
+FLAGS = flags.FLAGS
+
 
 class ViewBuilder(object):
     """Models a server addresses response as a python dictionary."""
@@ -50,22 +53,37 @@
             if network_label not in networks:
                 networks[network_label] = []
 
-            networks[network_label].extend(self._extract_ipv4(interface))
+            ip_addresses = list(self._extract_ipv4_addresses(interface))
+
+            if FLAGS.use_ipv6:
+                ipv6_address = self._extract_ipv6_address(interface)
+                if ipv6_address is not None:
+                    ip_addresses.append(ipv6_address)
+
+            networks[network_label].extend(ip_addresses)
 
         return networks
 
     def build_network(self, interfaces, network_label):
         for interface in interfaces:
             if interface['network']['label'] == network_label:
-                ips = self._extract_ipv4(interface)
-                return {network_label: list(ips)}
+                ips = list(self._extract_ipv4_addresses(interface))
+                ipv6 = self._extract_ipv6_address(interface)
+                if ipv6 is not None:
+                    ips.append(ipv6)
+                return {network_label: ips}
         return None
 
-    def _extract_ipv4(self, interface):
+    def _extract_ipv4_addresses(self, interface):
         for fixed_ip in interface['fixed_ips']:
             yield self._build_ip_entity(fixed_ip['address'], 4)
             for floating_ip in fixed_ip.get('floating_ips', []):
                 yield self._build_ip_entity(floating_ip['address'], 4)
 
+    def _extract_ipv6_address(self, interface):
+        fixed_ipv6 = interface.get('fixed_ipv6')
+        if fixed_ipv6 is not None:
+            return self._build_ip_entity(fixed_ipv6, 6)
+
     def _build_ip_entity(self, address, version):
         return {'addr': address, 'version': version}
 
=== 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-19 13:40:32 +0000
@@ -31,6 +31,7 @@
 from nova import auth
 from nova import exception
 from nova import flags
+from nova import ipv6
 from nova import utils
 
 
@@ -577,6 +578,18 @@
     instance_id = Column(Integer, ForeignKey('instances.id'), nullable=False)
     instance = relationship(Instance, backref=backref('virtual_interfaces'))
 
+    @property
+    def fixed_ipv6(self):
+        cidr_v6 = self.network.cidr_v6
+        if cidr_v6 is None:
+            ipv6_address = None
+        else:
+            project_id = self.instance.project_id
+            mac = self.address
+            ipv6_address = ipv6.to_global(cidr_v6, mac, project_id)
+
+        return ipv6_address
+
 
 # TODO(vish): can these both come from the same baseclass?
 class FixedIp(BASE, NovaBase):
 
=== modified file 'nova/tests/api/openstack/test_servers.py'
--- nova/tests/api/openstack/test_servers.py	2011-07-16 00:46:09 +0000
+++ nova/tests/api/openstack/test_servers.py	2011-07-19 13:40:32 +0000
@@ -433,20 +433,65 @@
         self.assertEquals(ip.getAttribute('addr'), private)
 
     def test_get_server_by_id_with_addresses_v1_1(self):
-        interfaces = [
-            {
-                'network': {'label': 'network_1'},
-                'fixed_ips': [
-                    {'address': '192.168.0.3'},
-                    {'address': '192.168.0.4'},
-                ],
-            },
-            {
-                'network': {'label': 'network_2'},
-                'fixed_ips': [
-                    {'address': '172.19.0.1'},
-                    {'address': '172.19.0.2'},
-                ],
+        FLAGS.use_ipv6 = True
+        interfaces = [
+            {
+                'network': {'label': 'network_1'},
+                'fixed_ips': [
+                    {'address': '192.168.0.3'},
+                    {'address': '192.168.0.4'},
+                ],
+            },
+            {
+                'network': {'label': 'network_2'},
+                'fixed_ips': [
+                    {'address': '172.19.0.1'},
+                    {'address': '172.19.0.2'},
+                ],
+                'fixed_ipv6': '2001:4860::12',
+            },
+        ]
+        new_return_server = return_server_with_interfaces(interfaces)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+
+        req = webob.Request.blank('/v1.1/servers/1')
+        res = req.get_response(fakes.wsgi_app())
+
+        res_dict = json.loads(res.body)
+        self.assertEqual(res_dict['server']['id'], 1)
+        self.assertEqual(res_dict['server']['name'], 'server1')
+        addresses = res_dict['server']['addresses']
+        expected = {
+            'network_1': [
+                {'addr': '192.168.0.3', 'version': 4},
+                {'addr': '192.168.0.4', 'version': 4},
+            ],
+            'network_2': [
+                {'addr': '172.19.0.1', 'version': 4},
+                {'addr': '172.19.0.2', 'version': 4},
+                {'addr': '2001:4860::12', 'version': 6},
+            ],
+        }
+
+        self.assertEqual(addresses, expected)
+
+    def test_get_server_by_id_with_addresses_v1_1_ipv6_disabled(self):
+        FLAGS.use_ipv6 = False
+        interfaces = [
+            {
+                'network': {'label': 'network_1'},
+                'fixed_ips': [
+                    {'address': '192.168.0.3'},
+                    {'address': '192.168.0.4'},
+                ],
+            },
+            {
+                'network': {'label': 'network_2'},
+                'fixed_ips': [
+                    {'address': '172.19.0.1'},
+                    {'address': '172.19.0.2'},
+                ],
+                'fixed_ipv6': '2001:4860::12',
             },
         ]
         new_return_server = return_server_with_interfaces(interfaces)
@@ -473,6 +518,7 @@
         self.assertEqual(addresses, expected)
 
     def test_get_server_addresses_v1_1(self):
+        FLAGS.use_ipv6 = True
         interfaces = [
             {
                 'network': {'label': 'network_1'},
@@ -492,6 +538,7 @@
                     },
                     {'address': '172.19.0.2'},
                 ],
+                'fixed_ipv6': '2001:4860::12',
             },
         ]
 
@@ -514,6 +561,7 @@
                     {'version': 4, 'addr': '172.19.0.1'},
                     {'version': 4, 'addr': '1.2.3.4'},
                     {'version': 4, 'addr': '172.19.0.2'},
+                    {'version': 6, 'addr': '2001:4860::12'},
                 ],
             },
         }
@@ -521,6 +569,7 @@
         self.assertEqual(res_dict, expected)
 
     def test_get_server_addresses_single_network_v1_1(self):
+        FLAGS.use_ipv6 = True
         interfaces = [
             {
                 'network': {'label': 'network_1'},
@@ -540,6 +589,7 @@
                     },
                     {'address': '172.19.0.2'},
                 ],
+                'fixed_ipv6': '2001:4860::12',
             },
         ]
         _return_vifs = return_virtual_interface_by_instance(interfaces)
@@ -556,6 +606,7 @@
                 {'version': 4, 'addr': '172.19.0.1'},
                 {'version': 4, 'addr': '1.2.3.4'},
                 {'version': 4, 'addr': '172.19.0.2'},
+                {'version': 6, 'addr': '2001:4860::12'},
             ],
         }
         self.assertEqual(res_dict, expected)