From a14a18157bb53934b3a86fc4a7b9c58d2aae8d56 Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Fri, 29 Jul 2011 16:16:05 -0500
Subject: allow getting by the cidr_v6

---
 nova/db/sqlalchemy/api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index a13d60ec4..066fbd98a 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1680,7 +1680,8 @@ def network_get_by_bridge(context, bridge):
 def network_get_by_cidr(context, cidr):
     session = get_session()
     result = session.query(models.Network).\
-                filter_by(cidr=cidr).first()
+                filter(or_(models.Network.cidr == cidr,
+                           models.Network.cidr_v6 == cidr).first()
 
     if not result:
         raise exception.NetworkNotFoundForCidr(cidr=cidr)
-- 
cgit