db/api: fix network_get_by_cidr()

User of the function is only 'nova-manage network delete'.
It doesn't check deleted flag which must be checked.
Otherwise some it might pick up deleted column depending on query result,
and tries to delete already deleted columns and results in exception.

1 files changed, 3 insertions, 1 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index ad51f5192..abfa6a3b7 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1681,7 +1681,9 @@ 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_by(cidr=cidr).\
+                filter_by(deleted=False).\
+                first()
 
     if not result:
         raise exception.NetworkNotFoundForCidr(cidr=cidr)