unable to router-interface-delete on no-snat routers

[Aaron Rosen]

2013-09-16 16:21:07.007 21470 DEBUG neutron.plugins.nicira.api_client.request_eventlet [-] [73] Completed request 'GET /ws.v1/lrouter/3ba7ab35-46f3-4fa8-83cd-f3e344c52a00/nat?fields=*&_page_length=1000&tag_scope=quantum': 200 _handle_request /opt/stack/neutron/neutron/plugins/nicira/api_client/request_eventlet.py:156
2013-09-16 16:21:07.007 21470 ERROR neutron.api.v2.resource [-] remove_router_interface failed
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource Traceback (most recent call last):
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource File "/opt/stack/neutron/neutron/api/v2/resource.py", line 84, in resource
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource result = method(request=request, **args)
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource File "/opt/stack/neutron/neutron/api/v2/base.py", line 185, in _handle_action
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource return getattr(self._plugin, name)(*arg_list, **kwargs)
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource File "/opt/stack/neutron/neutron/plugins/nicira/NeutronPlugin.py", line 1678, in remove_router_interface
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource self._delete_subnet_snat_rule(router, subnet)
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource File "/opt/stack/neutron/neutron/plugins/nicira/NeutronPlugin.py", line 1584, in _delete_subnet_snat_rule
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource source_ip_addresses=subnet['cidr'])
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource File "/opt/stack/neutron/neutron/plugins/nicira/nvplib.py", line 1301, in delete_nat_rules_by_match
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource max_rules=max_num_expected)
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource NvpNatRuleMismatch: While retrieving NAT rules, 0 were found whereas rules in the (1,1) interval were expected
2013-09-16 16:21:07.007 21470 TRACE neutron.api.v2.resource

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/46837

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/46837
Committed: http://github.com/openstack/neutron/commit/f01aed9a1e2b2c686f91787c6382a466a9211d95
Submitter: Jenkins
Branch: master

commit f01aed9a1e2b2c686f91787c6382a466a9211d95
Author: Aaron Rosen <email address hidden>
Date: Mon Sep 16 16:28:19 2013 -0700

    Fix error raised when router-interface-delete on no-snat routers

    Previously, a 500 error would be raised trying to remove a subnet
    from a no-snat router because we were trying to remove the snat
    rules that didn't exist in the router.

    Fixes bug: 1226323

    Change-Id: Ieff0ed4bdbac39ac07e597753272a4f5d40cb346