From 6e3225013fe96a3dbe23873539395ec0e7166bc5 Mon Sep 17 00:00:00 2001
From: Rosario Di Somma <rosario.disomma@dreamhost.com>
Date: Fri, 25 Oct 2013 16:39:29 +0000
Subject: [PATCH] Fix autocreate subnet ownership problem
DHC-1560
When a user create a network in a tenant he is not member of
passing the --tenant_id option to the net-create command, the
network is created with the right ownership, but the subnet
we are creating automatically is owned by the tenant from the
command credentials rather than the value passed explicitly
as the owner.
Change-Id: I48810b87c6603f8d511a7fd4b4e64c1f4370a56e
Signed-off-by: Rosario Di Somma <rosario.disomma@dreamhost.com>
---
akanda/neutron/plugins/decorators.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/akanda/neutron/plugins/decorators.py b/akanda/neutron/plugins/decorators.py
index 915fa31..4fe854c 100644
--- a/akanda/neutron/plugins/decorators.py
+++ b/akanda/neutron/plugins/decorators.py
@@ -79,6 +79,7 @@ def auto_add_subnet_to_router(f):
return subnet
return wrapper
+
# NOTE(mark): in Havana gateway_ip cannot be updated leaving here if this
# returns in Icehouse.
def sync_subnet_gateway_port(f):
@@ -168,9 +169,11 @@ def _add_subnet_to_router(context, subnet):
router = router_q.first()
if not router:
- router_args = {'tenant_id': context.tenant_id,
- 'name': 'ak-%s' % context.tenant_id,
- 'admin_state_up': True}
+ router_args = {
+ 'tenant_id': subnet['tenant_id'],
+ 'name': 'ak-%s' % subnet['tenant_id'],
+ 'admin_state_up': True
+ }
router = plugin.create_router(context, {'router': router_args})
if not _update_internal_gateway_port_ip(context, router['id'], subnet):
plugin.add_router_interface(context.elevated(),
@@ -279,6 +282,7 @@ def _add_ipv6_subnet(context, network):
if not existing:
create_args = {
+ 'tenant_id': network['tenant_id'],
'network_id': network['id'],
'name': '',
'cidr': str(candidate_cidr),