Merge "Replace deprecated with_lockmode with with_for_update"

Author: Zuul

nova/db/sqlalchemy/api.py

@@ -1143,7 +1143,7 @@ def floating_ip_update(context, address, values):
 def dnsdomain_get(context, fqdomain):
     return model_query(context, models.DNSDomain, read_deleted="no").\
                filter_by(domain=fqdomain).\
-               with_lockmode('update').\
+               with_for_update().\
                first()
 
 
@@ -3106,7 +3106,7 @@ def network_query(project_filter, id=None):
             filter_kwargs['id'] = id
         return model_query(context, models.Network, read_deleted="no").\
                        filter_by(**filter_kwargs).\
-                       with_lockmode('update').\
+                       with_for_update().\
                        first()
 
     if not force: