Merge "Canonizes IPv6 before insert it into the db"

1 files changed, 15 insertions, 3 deletions

diff --git a/nova/db/sqlalchemy/types.py b/nova/db/sqlalchemy/types.py
index 275e61a4c..ef861b832 100644
--- a/nova/db/sqlalchemy/types.py
+++ b/nova/db/sqlalchemy/types.py
@@ -18,9 +18,21 @@
 """Custom SQLAlchemy types."""
 
 from sqlalchemy.dialects import postgresql
-from sqlalchemy import String
+from sqlalchemy import types
 
+from nova import utils
 
-def IPAddress():
+
+class IPAddress(types.TypeDecorator):
     """An SQLAlchemy type representing an IP-address."""
-    return String(39).with_variant(postgresql.INET(), 'postgresql')
+    impl = types.String(39).with_variant(postgresql.INET(), 'postgresql')
+
+    def process_bind_param(self, value, dialect):
+        """Process/Formats the value before insert it into the db."""
+        if dialect.name == 'postgresql':
+            return value
+        # NOTE(maurosr): The purpose here is to convert ipv6 to the shortened
+        # form, not validate it.
+        elif utils.is_valid_ipv6(value):
+            return utils.get_shortened_ipv6(value)
+        return value