router-gateway-clear fails when out of sync with nvp

[Aaron Rosen]

arosen@arosen-desktop:~/devstack$ quantum router-gateway-clear router1
While retrieving NAT rules, 0 were found whereas rules in the (1,1) interval were expected

[Salvatore Orlando (salvatore-orlando)]

The current code complains it does not find the expected number of NAT rules to delete.
The constraint should be relaxed.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/33733
Committed: http://github.com/openstack/quantum/commit/0d5dccfd3223da59c446e4a8c2e34d8f250a28af
Submitter: Jenkins
Branch: master

commit 0d5dccfd3223da59c446e4a8c2e34d8f250a28af
Author: Salvatore Orlando <email address hidden>
Date: Thu Jun 20 00:51:29 2013 +0200

    Nicira plugin: Do not expect a minimum number of SNAT rules

    Bug 1192392

    The code was assuming a SNAT rule for each subnet was always present
    when clearing a gateway. If the SNAT rule was removed for some other
    reason from the NVP backend, this would have led to the failure of
    the whole operation; however, a failure won't have been necessary
    in this case, as the final effect of the operation is to remove
    the rules anyway.

    Also, this patch ensures a quantum router is put in ERROR state if
    it is not found on the NVP backend.

    Change-Id: Iac1a61342b490d0d971b884e1aa8d9567b15cac0