delete_subnet is not called in IPAM driver on subnet deallocation if ML2 plugin is used

[Pavel Bondar]

ML2 plugin redefines [1] delete_subnet from db_base_plugin_v2,
but it does call to delete_subnet from pluggable IPAM implementation.

Subnets are correctly deleted from Horizon UI, but call to third-party IPAM provider is not done,
so subnets persist on IPAM provider.

[1] https://github.com/openstack/neutron/blob/master/neutron/plugins/ml2/plugin.py#L880

[John Belamaric (jbelamaric)]

This will need to be ported back to stable/liberty, too. Is there a unit test for this? The reference driver must suffer the same issue.

[Pavel Bondar (pasha117)]

I believe refence IPAM driver suffers from it too, but have not verified it yet. Looks like existent UT do not catch undeleted subnets in reference IPAM driver, so need to add one.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/239885
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=99573f62d1fc79a4308784ab2c799d836b7a3d74
Submitter: Jenkins
Branch: master

commit 99573f62d1fc79a4308784ab2c799d836b7a3d74
Author: Pavel Bondar <email address hidden>
Date: Wed Oct 28 12:22:52 2015 +0300

    Add call to pluggable IPAM from ml2 delete_subnet

    ml2 plugin overrides delete_subnet and do not call super(),
    so pluggable IPAM action defined in db_base_plugin_v2 are not called.
    As a result subnets can not be deleted from IPAM driver if ml2 plugin
    is used.

    Added ipam.delete_subnet call into ml2 delete_subnet.
    Patch includes UT to verify IPAM driver is called on subnet
    allocation and deallocation.
    Test class is inherited from TestMl2SubnetsV2, so all SubnetV2 tests are
    additionally executed for ml2 plugin with reference IPAM driver.

    Closes-Bug: #1510653

    Change-Id: I2b7ddfe70a1275a141af38e18151e1fc000e2682

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/244012

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/244012
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=2e098ce2efe2ba6557473353a09d57b3cec3b2fd
Submitter: Jenkins
Branch: stable/liberty

commit 2e098ce2efe2ba6557473353a09d57b3cec3b2fd
Author: Pavel Bondar <email address hidden>
Date: Wed Oct 28 12:22:52 2015 +0300

    Add call to pluggable IPAM from ml2 delete_subnet

    ml2 plugin overrides delete_subnet and do not call super(),
    so pluggable IPAM action defined in db_base_plugin_v2 are not called.
    As a result subnets can not be deleted from IPAM driver if ml2 plugin
    is used.

    Added ipam.delete_subnet call into ml2 delete_subnet.
    Patch includes UT to verify IPAM driver is called on subnet
    allocation and deallocation.
    Test class is inherited from TestMl2SubnetsV2, so all SubnetV2 tests are
    additionally executed for ml2 plugin with reference IPAM driver.

    Closes-Bug: #1510653

    Change-Id: I2b7ddfe70a1275a141af38e18151e1fc000e2682
    (cherry picked from commit 99573f62d1fc79a4308784ab2c799d836b7a3d74)

[Thierry Carrez (ttx)]

This issue was fixed in the openstack/neutron 8.0.0.0b1 development milestone.

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/neutron 7.0.1 release.