adding fixed_ipv6 property to VirtualInterface model; exposing ipv6 in api

4 files changed, 38 insertions, 5 deletions

diff --git a/nova/api/openstack/views/addresses.py b/nova/api/openstack/views/addresses.py
index a242efa45..77310e4b1 100644
--- a/nova/api/openstack/views/addresses.py
+++ b/nova/api/openstack/views/addresses.py
@@ -50,22 +50,36 @@ class ViewBuilderV11(ViewBuilder):
             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))
+
+            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}
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index a831516a8..8a4bd11b7 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -949,8 +949,8 @@ def virtual_interface_get_by_instance(context, instance_id):
                        options(joinedload('instance')).\
                        options(joinedload('fixed_ips')).\
                        all()
-    return vif_refs
 
+    return vif_refs
 
 @require_context
 def virtual_interface_get_by_instance_and_network(context, instance_id,
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index d29d3d6f1..def33d056 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -31,6 +31,7 @@ from nova.db.sqlalchemy.session import get_session
 from nova import auth
 from nova import exception
 from nova import flags
+from nova import ipv6
 from nova import utils
 
 
@@ -575,6 +576,18 @@ class VirtualInterface(BASE, NovaBase):
     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):
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 1577c922b..467aa907c 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -447,6 +447,7 @@ class ServersTest(test.TestCase):
                     {'address': '172.19.0.1'},
                     {'address': '172.19.0.2'},
                 ],
+                'fixed_ipv6': '2001:4860::12',
             },
         ]
         new_return_server = return_server_with_interfaces(interfaces)
@@ -467,6 +468,7 @@ class ServersTest(test.TestCase):
             'network_2': [
                 {'addr': '172.19.0.1', 'version': 4},
                 {'addr': '172.19.0.2', 'version': 4},
+                {'addr': '2001:4860::12', 'version': 6},
             ],
         }
 
@@ -492,6 +494,7 @@ class ServersTest(test.TestCase):
                     },
                     {'address': '172.19.0.2'},
                 ],
+                'fixed_ipv6': '2001:4860::12',
             },
         ]
 
@@ -514,6 +517,7 @@ class ServersTest(test.TestCase):
                     {'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'},
                 ],
             },
         }
@@ -540,6 +544,7 @@ class ServersTest(test.TestCase):
                     },
                     {'address': '172.19.0.2'},
                 ],
+                'fixed_ipv6': '2001:4860::12',
             },
         ]
         _return_vifs = return_virtual_interface_by_instance(interfaces)
@@ -556,6 +561,7 @@ class ServersTest(test.TestCase):
                 {'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)