From ed128cd50269578a3495bc680a4b4b2d61a92d24 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Mon, 22 Aug 2011 22:18:43 -0700
Subject: [PATCH 01/13] pulling all qmanager changes into a branch based on
trunk, as they were previously stacked on top of melange
---
nova/db/api.py | 5 +++++
nova/db/sqlalchemy/api.py | 20 +++++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/nova/db/api.py b/nova/db/api.py
index 2d854f24c..9ff3a1c74 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -419,6 +419,11 @@ def virtual_interface_get_by_address(context, address):
return IMPL.virtual_interface_get_by_address(context, address)
+def virtual_interface_get_by_uuid(context, vif_uuid):
+ """Gets a virtual interface from the table filtering on vif uuid."""
+ return IMPL.virtual_interface_get_by_uuid(context, vif_uuid)
+
+
def virtual_interface_get_by_fixed_ip(context, fixed_ip_id):
"""Gets the virtual interface fixed_ip is associated with."""
return IMPL.virtual_interface_get_by_fixed_ip(context, fixed_ip_id)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 04b5405f6..d96b951a1 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -688,10 +688,8 @@ def fixed_ip_associate(context, address, instance_id, network_id=None):
def fixed_ip_associate_pool(context, network_id, instance_id=None, host=None):
session = get_session()
with session.begin():
- network_or_none = or_(models.FixedIp.network_id == network_id,
- models.FixedIp.network_id == None)
fixed_ip_ref = session.query(models.FixedIp).\
- filter(network_or_none).\
+ filter_by(network_id=network_id).\
filter_by(reserved=False).\
filter_by(deleted=False).\
filter_by(instance=None).\
@@ -928,6 +926,22 @@ def virtual_interface_get_by_address(context, address):
return vif_ref
+@require_context
+def virtual_interface_get_by_uuid(context, vif_uuid):
+ """Gets a virtual interface from the table.
+
+ :param vif_uuid: = the uuid of the interface you're looking to get
+ """
+ session = get_session()
+ vif_ref = session.query(models.VirtualInterface).\
+ filter_by(uuid=vif_uuid).\
+ options(joinedload('network')).\
+ options(joinedload('instance')).\
+ options(joinedload('fixed_ips')).\
+ first()
+ return vif_ref
+
+
@require_context
def virtual_interface_get_by_fixed_ip(context, fixed_ip_id):
"""Gets the virtual interface fixed_ip is associated with.
From ef206acdc7c8d0a4c55711d1fe1f3b41114acd44 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Sun, 28 Aug 2011 11:37:19 -0700
Subject: [PATCH 02/13] use 'uuid' field in networks table rather than
'bridge'. Specify project_id when creating instance in unit test
---
nova/db/api.py | 5 +++++
nova/db/sqlalchemy/api.py | 13 +++++++++++++
2 files changed, 18 insertions(+)
diff --git a/nova/db/api.py b/nova/db/api.py
index 9ff3a1c74..17ef0bd0b 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -708,6 +708,11 @@ def network_get_by_bridge(context, bridge):
return IMPL.network_get_by_bridge(context, bridge)
+def network_get_by_uuid(context, uuid):
+ """Get a network by uuid or raise if it does not exist."""
+ return IMPL.network_get_by_uuid(context, uuid)
+
+
def network_get_by_cidr(context, cidr):
"""Get a network by cidr or raise if it does not exist"""
return IMPL.network_get_by_cidr(context, cidr)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index d96b951a1..80ce76e8f 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1846,6 +1846,19 @@ def network_get_by_bridge(context, bridge):
return result
+@require_admin_context
+def network_get_by_uuid(context, uuid):
+ session = get_session()
+ result = session.query(models.Network).\
+ filter_by(uuid=uuid).\
+ filter_by(deleted=False).\
+ first()
+
+ if not result:
+ raise exception.NetworkNotFoundForUUID(uuid=uuid)
+ return result
+
+
@require_admin_context
def network_get_by_cidr(context, cidr):
session = get_session()
From 9fd5d5382aa0ac15d92d31084816e8ce135d622b Mon Sep 17 00:00:00 2001
From: "danwent@gmail.com" <>
Date: Sun, 28 Aug 2011 20:00:38 -0700
Subject: [PATCH 03/13] restore fixed_ip_associate_pool in
nova/db/sqlalchemy.py to its original form before this branch. Figured out
how to make unit tests pass without requiring that this function changes
---
nova/db/sqlalchemy/api.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 80ce76e8f..00af62682 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -688,8 +688,10 @@ def fixed_ip_associate(context, address, instance_id, network_id=None):
def fixed_ip_associate_pool(context, network_id, instance_id=None, host=None):
session = get_session()
with session.begin():
+ network_or_none = or_(models.FixedIp.network_id == network_id,
+ models.FixedIp.network_id == None)
fixed_ip_ref = session.query(models.FixedIp).\
- filter_by(network_id=network_id).\
+ filter(network_or_none).\
filter_by(reserved=False).\
filter_by(deleted=False).\
filter_by(instance=None).\
From e5e2d0be4e0f2abdfcfeb0fa2e51c44320395c73 Mon Sep 17 00:00:00 2001
From: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date: Fri, 2 Sep 2011 12:34:14 -0700
Subject: [PATCH 04/13] Fix for LP Bug #839269
---
nova/db/api.py | 6 ++++--
nova/db/sqlalchemy/api.py | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/nova/db/api.py b/nova/db/api.py
index 148887635..efc088e35 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -324,13 +324,15 @@ def migration_get_by_instance_and_status(context, instance_uuid, status):
####################
-def fixed_ip_associate(context, address, instance_id, network_id=None):
+def fixed_ip_associate(context, address, instance_id, network_id=None,
+ reserved=False):
"""Associate fixed ip to instance.
Raises if fixed ip is not available.
"""
- return IMPL.fixed_ip_associate(context, address, instance_id, network_id)
+ return IMPL.fixed_ip_associate(context, address, instance_id, network_id,
+ reserved)
def fixed_ip_associate_pool(context, network_id, instance_id=None, host=None):
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index b99667afc..e0be8454e 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -669,14 +669,15 @@ def floating_ip_update(context, address, values):
@require_admin_context
-def fixed_ip_associate(context, address, instance_id, network_id=None):
+def fixed_ip_associate(context, address, instance_id, network_id=None,
+ reserved=False):
session = get_session()
with session.begin():
network_or_none = or_(models.FixedIp.network_id == network_id,
models.FixedIp.network_id == None)
fixed_ip_ref = session.query(models.FixedIp).\
filter(network_or_none).\
- filter_by(reserved=False).\
+ filter_by(reserved=reserved).\
filter_by(deleted=False).\
filter_by(address=address).\
with_lockmode('update').\
From a75101ee660047006875629b0b9316352057c108 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Fri, 2 Sep 2011 13:05:24 -0700
Subject: [PATCH 05/13] feedback from jk0's review, including removing a lot of
spaces from docstrings
---
nova/db/sqlalchemy/api.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 09356e966..e0da2269d 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -946,7 +946,7 @@ def virtual_interface_get_by_address(context, address):
def virtual_interface_get_by_uuid(context, vif_uuid):
"""Gets a virtual interface from the table.
- :param vif_uuid: = the uuid of the interface you're looking to get
+ :param vif_uuid: the uuid of the interface you're looking to get
"""
session = get_session()
vif_ref = session.query(models.VirtualInterface).\
From 97b2d1b83c4bc44b2ef03119e6f3b24350686e33 Mon Sep 17 00:00:00 2001
From: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date: Mon, 5 Sep 2011 14:45:41 +0900
Subject: [PATCH 06/13] Fix bug #835919 that output a option file for dnsmasq
not to offer a default gateway on second vif.
---
nova/db/sqlalchemy/api.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)
mode change 100644 => 100755 nova/db/sqlalchemy/api.py
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
old mode 100644
new mode 100755
index b99667afc..aee1c2a55
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1415,6 +1415,21 @@ def instance_get_all_by_reservation(context, reservation_id):
filter_by(project_id=context.project_id).\
filter_by(deleted=False).\
all()
+
+@require_admin_context
+def instance_get_all_by_network(context, network_id):
+ session = get_session()
+ return session.query(models.Instance).\
+ options(joinedload_all('fixed_ips.floating_ips')).\
+ options(joinedload('virtual_interfaces')).\
+ options(joinedload('security_groups')).\
+ options(joinedload_all('fixed_ips.network')).\
+ options(joinedload('metadata')).\
+ options(joinedload('instance_type')).\
+ filter_by(deleted=can_read_deleted(context)).\
+ filter_by(network_id=network_id).\
+ all()
+
@require_context
From 272fcf91454afda37aa54898d9b9493327b530d6 Mon Sep 17 00:00:00 2001
From: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date: Mon, 5 Sep 2011 20:23:28 +0900
Subject: [PATCH 07/13] implement unit test for linux_net
---
nova/db/api.py | 5 +++++
1 file changed, 5 insertions(+)
mode change 100644 => 100755 nova/db/api.py
diff --git a/nova/db/api.py b/nova/db/api.py
old mode 100644
new mode 100755
index 148887635..85e9c7669
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -532,6 +532,11 @@ def instance_get_all_by_reservation(context, reservation_id):
return IMPL.instance_get_all_by_reservation(context, reservation_id)
+def instance_get_all_by_network(context, network_id):
+ """Get all instances belonging to a network."""
+ return IMPL.instance_get_all_by_network(context, network_id)
+
+
def instance_get_by_fixed_ip(context, address):
"""Get an instance for a fixed ip by address."""
return IMPL.instance_get_by_fixed_ip(context, address)
From d193081258f2a3c0cedcc220c49355acc600c7a2 Mon Sep 17 00:00:00 2001
From: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date: Mon, 5 Sep 2011 21:13:00 +0900
Subject: [PATCH 08/13] format for pep8
---
nova/db/api.py | 4 ++--
nova/db/sqlalchemy/api.py | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/nova/db/api.py b/nova/db/api.py
index 85e9c7669..faac13966 100755
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -535,8 +535,8 @@ def instance_get_all_by_reservation(context, reservation_id):
def instance_get_all_by_network(context, network_id):
"""Get all instances belonging to a network."""
return IMPL.instance_get_all_by_network(context, network_id)
-
-
+
+
def instance_get_by_fixed_ip(context, address):
"""Get an instance for a fixed ip by address."""
return IMPL.instance_get_by_fixed_ip(context, address)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index aee1c2a55..3194a5231 100755
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1415,8 +1415,8 @@ def instance_get_all_by_reservation(context, reservation_id):
filter_by(project_id=context.project_id).\
filter_by(deleted=False).\
all()
-
-@require_admin_context
+
+
def instance_get_all_by_network(context, network_id):
session = get_session()
return session.query(models.Instance).\
@@ -1431,7 +1431,6 @@ def instance_get_all_by_network(context, network_id):
all()
-
@require_context
def instance_get_by_fixed_ip(context, address):
"""Return instance ref by exact match of FixedIP"""
From e6ab1718de8eaba5ca6282ec291631765fe9c084 Mon Sep 17 00:00:00 2001
From: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date: Tue, 6 Sep 2011 10:14:27 +0900
Subject: [PATCH 09/13] correct a method to collect instances from db add
interface data to test
---
nova/db/api.py | 5 -----
nova/db/sqlalchemy/api.py | 14 --------------
2 files changed, 19 deletions(-)
diff --git a/nova/db/api.py b/nova/db/api.py
index faac13966..148887635 100755
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -532,11 +532,6 @@ def instance_get_all_by_reservation(context, reservation_id):
return IMPL.instance_get_all_by_reservation(context, reservation_id)
-def instance_get_all_by_network(context, network_id):
- """Get all instances belonging to a network."""
- return IMPL.instance_get_all_by_network(context, network_id)
-
-
def instance_get_by_fixed_ip(context, address):
"""Get an instance for a fixed ip by address."""
return IMPL.instance_get_by_fixed_ip(context, address)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 3194a5231..b99667afc 100755
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1417,20 +1417,6 @@ def instance_get_all_by_reservation(context, reservation_id):
all()
-def instance_get_all_by_network(context, network_id):
- session = get_session()
- return session.query(models.Instance).\
- options(joinedload_all('fixed_ips.floating_ips')).\
- options(joinedload('virtual_interfaces')).\
- options(joinedload('security_groups')).\
- options(joinedload_all('fixed_ips.network')).\
- options(joinedload('metadata')).\
- options(joinedload('instance_type')).\
- filter_by(deleted=can_read_deleted(context)).\
- filter_by(network_id=network_id).\
- all()
-
-
@require_context
def instance_get_by_fixed_ip(context, address):
"""Return instance ref by exact match of FixedIP"""
From 23f90a9edd5033a187ca5a971d96d1fc03cd5e6e Mon Sep 17 00:00:00 2001
From: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date: Tue, 6 Sep 2011 10:20:28 +0900
Subject: [PATCH 10/13] revert codes for db
---
nova/db/api.py | 0
nova/db/sqlalchemy/api.py | 0
2 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 nova/db/api.py
mode change 100755 => 100644 nova/db/sqlalchemy/api.py
diff --git a/nova/db/api.py b/nova/db/api.py
old mode 100755
new mode 100644
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
old mode 100755
new mode 100644
From f9431a1f884bc6f93a1a0afee3eee4d7dc2d391b Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 8 Sep 2011 11:32:11 -0400
Subject: [PATCH 11/13] adding can_read_deleted back to db api
---
nova/db/sqlalchemy/api.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 523258841..1730b4ddb 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1277,6 +1277,10 @@ def instance_get_all_by_filters(context, filters):
changes_since = filters['changes-since']
query_prefix = query_prefix.\
filter(models.Instance.updated_at > changes_since)
+ else:
+ # filter out deleted instances if no changes-since filter provided
+ query_prefix = query_prefix.\
+ filter_by(deleted=can_read_deleted(context))
if not context.is_admin:
# If we're not admin context, add appropriate filter..
From 0873840079e6af51f8c6c43b8d4adea711667c5c Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 8 Sep 2011 15:26:44 -0400
Subject: [PATCH 12/13] converting fix to just address ec2; updating test
---
nova/db/sqlalchemy/api.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 1730b4ddb..523258841 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1277,10 +1277,6 @@ def instance_get_all_by_filters(context, filters):
changes_since = filters['changes-since']
query_prefix = query_prefix.\
filter(models.Instance.updated_at > changes_since)
- else:
- # filter out deleted instances if no changes-since filter provided
- query_prefix = query_prefix.\
- filter_by(deleted=can_read_deleted(context))
if not context.is_admin:
# If we're not admin context, add appropriate filter..
From 9403d4e0949fb7e41d4b865e3b4389dc1ab2a333 Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Mon, 12 Sep 2011 14:43:15 -0500
Subject: [PATCH 13/13] pep8 fixes
---
nova/db/sqlalchemy/api.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 40e2ca167..e5a661c7f 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -672,7 +672,7 @@ def floating_ip_update(context, address, values):
def fixed_ip_associate(context, address, instance_id, network_id=None,
reserved=False):
"""Keyword arguments:
- reserved -- should be a boolean value(True or False), exact value will be
+ reserved -- should be a boolean value(True or False), exact value will be
used to filter on the fixed ip address
"""
session = get_session()