Merge "getDHCPServerPort is modified to address Bug 4206"

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
index 284074d936f6c66cce757b9ef263f4c918041a28..4a56401d44542c9f7dc1e39c872a06c7017225e6 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
@@ -109,6 +109,10 @@ public class SecurityServicesImpl implements ConfigInterface, SecurityServicesMa
                 LOG.error("getDHCPServerPort: neutron port of {} is not found", neutronPortId);
                 return null;
             }
+            /* if the current port is a DHCP port, return the same*/
+            if (neutronPort.getDeviceOwner().contains("dhcp")) {
+                return neutronPort;
+            }
             /*Since all the fixed ip assigned to a port should be
              *from the same network, first port is sufficient.*/
             List<Neutron_IPs> fixedIps = neutronPort.getFixedIPs();