Merge "Fix to delete user and group association in Nuage Plugin"

This commit is contained in:
Jenkins
2014-09-26 17:25:33 +00:00
committed by Gerrit Code Review

View File

@@ -987,8 +987,7 @@ class NuagePlugin(db_base_plugin_v2.NeutronDbPluginV2,
super(NuagePlugin, self).delete_router(context, id) super(NuagePlugin, self).delete_router(context, id)
nuage_zone = self.nuageclient.get_zone_by_routerid(id) if not self._check_router_subnet_for_tenant(
if nuage_zone and not self._check_router_subnet_for_tenant(
context, neutron_router['tenant_id']): context, neutron_router['tenant_id']):
user_id, group_id = self.nuageclient.get_usergroup( user_id, group_id = self.nuageclient.get_usergroup(
neutron_router['tenant_id'], neutron_router['tenant_id'],