DHCP agent fails when used with plugin that doesn't supports extra_dhcp_opt extension

[Francois Eleouet]

When DHCP agent is used with ML2 plugin that doesn't yet support extra_dhcp_opt extension, it fails to serve IP adresses.

Here is the log:

2013-09-02 17:51:14.232 9079 DEBUG neutron.agent.linux.dhcp [-] Unable to access /opt/stack/data/neutron/dhcp/6b7f26d9-a1a4-44f9-b63c-1001f5f0d0ad/pid _get_value_from_conf_file /opt/stack/neutron/neutron/agent/linux/dhcp.py:217
2013-09-02 17:51:14.233 9079 ERROR neutron.agent.dhcp_agent [-] Unable to enable dhcp.
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent Traceback (most recent call last):
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent File "/opt/stack/neutron/neutron/agent/dhcp_agent.py", line 126, in call_driver
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent getattr(driver, action)(**action_kwargs)
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent File "/opt/stack/neutron/neutron/agent/linux/dhcp.py", line 165, in enable
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent self.restart()
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent File "/opt/stack/neutron/neutron/agent/linux/dhcp.py", line 122, in restart
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent self.enable()
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent File "/opt/stack/neutron/neutron/agent/linux/dhcp.py", line 168, in enable
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent self.spawn_process()
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent File "/opt/stack/neutron/neutron/agent/linux/dhcp.py", line 319, in spawn_process
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent '--dhcp-hostsfile=%s' % self._output_hosts_file(),
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent File "/opt/stack/neutron/neutron/agent/linux/dhcp.py", line 401, in _output_hosts_file
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent if port.extra_dhcp_opts:
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent AttributeError: 'DictModel' object has no attribute 'extra_dhcp_opts'
2013-09-02 17:51:14.233 9079 TRACE neutron.agent.dhcp_agent

Changing "if port.extra_dhcp_opts:" to "if hasattr(port, 'extra_dhcp_opts') and port.extra_dhcp_opts:" in the following places seems to fix the issue.

https://github.com/openstack/neutron/blob/master/neutron/agent/linux/dhcp.py#L401
https://github.com/openstack/neutron/blob/master/neutron/agent/linux/dhcp.py#L466

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit b63c6f9f839188ade489d77747164b0fec8ab116
Author: Francois Eleouet <email address hidden>
Date: Mon Sep 2 18:21:01 2013 +0200

    Fix DHCP agent to work without extra_dhcp_opt extension

    With the introduction of extra_dhcp_opt extension, DHCP agent
    stopped serving mac adresses when used in conjunction with a
    plugin that doesn't support this extension. This fixes the agent
    by not assuming that port dict contains extra_dhcp_opt key.

    Closes Bug: #1219893

    Change-Id: I5bb52f3092f04c5e332b43cb3a04de05edc29cf5