From: Mark McClain <mark.mcclain@dreamhost.com>
Date: Sun, 9 Sep 2012 19:19:46 +0000 (-0400)
Subject: Remove default name for DHCP port.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a42e40706667a0bb8c7a9b6740f853feacad9623;p=openstack-build%2Fneutron-build.git

Remove default name for DHCP port.

fixes bug 1048357

This patch removes the code that set the port name for the DHCP agent.

Change-Id: Icd769486c5f335d533349ac5e94ac9771c8ca450
---

diff --git a/quantum/db/dhcp_rpc_base.py b/quantum/db/dhcp_rpc_base.py
index 4f07527d7..42bee7812 100644
--- a/quantum/db/dhcp_rpc_base.py
+++ b/quantum/db/dhcp_rpc_base.py
@@ -116,7 +116,7 @@ class DhcpRpcCallbackMixin(object):
                 network_id=network_id,
                 tenant_id=network['tenant_id'],
                 mac_address=attributes.ATTR_NOT_SPECIFIED,
-                name='DHCP Agent',
+                name='',
                 device_owner='network:dhcp',
                 fixed_ips=[dict(subnet_id=s) for s in dhcp_enabled_subnet_ids])
 
diff --git a/quantum/tests/unit/test_db_rpc_base.py b/quantum/tests/unit/test_db_rpc_base.py
index 279079f91..dc6161795 100644
--- a/quantum/tests/unit/test_db_rpc_base.py
+++ b/quantum/tests/unit/test_db_rpc_base.py
@@ -119,7 +119,7 @@ class TestDhcpRpcCallackMixin(unittest.TestCase):
     def test_get_dhcp_port_create_new(self):
         self.plugin.get_network.return_value = dict(tenant_id='tenantid')
         create_spec = dict(tenant_id='tenantid', device_id='devid',
-                           network_id='netid', name='DHCP Agent',
+                           network_id='netid', name='',
                            admin_state_up=True,
                            device_owner='network:dhcp',
                            mac_address=mock.ANY)