x
/
group-based-policy
Code Issues Proposed changes

Revert "Make DHCP provisioning blocks conditional" 

This reverts commit 6140b9d5fc.

Change-Id: I5c559ffa297e34b10374f88254787e6135b79716
This commit is contained in:
Thomas Bachman 2019-09-12 16:25:55 +00:00
parent 6140b9d5fc
commit 36ec2d5b63
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gbpservice/neutron/plugins/ml2plus/drivers/apic_aim/mechanism_driver.py
View File

@ -2113,11 +2113,6 @@ class ApicMechanismDriver(api_plus.MechanismDriver,
def _insert_provisioning_block(self, context):
# we insert a status barrier to prevent the port from transitioning
# to active until the agent reports back that the wiring is done
# If using optimized DHCP, no need to add a provisioning block.
if self.enable_dhcp_opt:
return
port = context.current
if (not context.host or
port['status'] == n_constants.PORT_STATUS_ACTIVE):

14
gbpservice/neutron/tests/unit/plugins/ml2plus/test_apic_aim.py
View File

@ -3438,15 +3438,6 @@ class TestAimMapping(ApicAimTestCase):
self.assertTrue(sp3['is_implicit'])
def test_dhcp_provisioning_blocks_inserted_on_update(self):
self._test_dhcp_provisioning_blocks_inserted_on_update()
def test_dhcp_provisioning_blocks_inserted_on_update_non_optimized(self):
self._test_dhcp_provisioning_blocks_inserted_on_update(optimized=True)
def _test_dhcp_provisioning_blocks_inserted_on_update(self,
optimized=False):
# enable or disable optimized DHCP
self.driver.enable_dhcp_opt = optimized
ctx = n_context.get_admin_context()
plugin = self.plugin
@ -3473,10 +3464,7 @@ class TestAimMapping(ApicAimTestCase):
'add_provisioning_component') as ap:
port['port'].update(update_dict)
plugin.update_port(ctx, port['port']['id'], port)
if optimized:
ap.assert_not_called()
else:
ap.assert_called()
ap.assert_called()
setattr(driver_context.PortContext, "host_agents", orig_host_agents)
dhcp_agt_mock.stop()