diff options
| author | Jason Koelker <jason@koelker.net> | 2011-07-29 16:16:05 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-07-29 16:16:05 -0500 |
| commit | a14a18157bb53934b3a86fc4a7b9c58d2aae8d56 (patch) | |
| tree | d6914801fef5adc1809d92162057e6843b6527c7 | |
| parent | 54f0ad92cf4f94097e62fc0e51fdc1403504a04b (diff) | |
| download | nova-a14a18157bb53934b3a86fc4a7b9c58d2aae8d56.tar.gz nova-a14a18157bb53934b3a86fc4a7b9c58d2aae8d56.tar.xz nova-a14a18157bb53934b3a86fc4a7b9c58d2aae8d56.zip | |
allow getting by the cidr_v6
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 3 |
1 files changed, 2 insertions, 1 deletions
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) |