[VNC OpenStack] Admin can set router interface

Authorize administrative users to set router interface even the router does not belongs to the user's project. Change-Id: Ie9f44b60a9018f67bd62a49b00aef22a6ec77ac7 Partial-Bug: #1686489
Juniper · Jun 6, 2017 · 3bea664 · 3bea664
1 parent 2cf6031
commit 3bea664
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py b/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py
@@ -3523,7 +3523,8 @@ def add_router_interface(self, context, router_id, port_id=None, subnet_id=None)
         router_obj = self._logical_router_read(router_id)
         if port_id:
             port = self.port_read(port_id)
-            if port['tenant_id'] != context['tenant_id'].replace('-', ''):
+            if (not context.get('is_admin', False) and
+                    port['tenant_id'] != context['tenant_id'].replace('-', '')):
                 self._raise_contrail_exception('RouterInterfaceNotFound',
                                                router_id=router_id,
                                                port_id=port_id)
@@ -3547,7 +3548,9 @@ def add_router_interface(self, context, router_id, port_id=None, subnet_id=None)
 
         elif subnet_id:
             subnet = self.subnet_read(subnet_id)
-            if subnet['tenant_id'] != context['tenant_id'].replace('-', ''):
+            if (not context.get('is_admin', False) and
+                    subnet['tenant_id'] !=
+                    context['tenant_id'].replace('-', '')):
                 self._raise_contrail_exception(
                      'RouterInterfaceNotFoundForSubnet',
                      router_id=router_id,