Merge "Bug 3388 Added DNS and ICMP rules for DHCP EPG"

diff --cc neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronPortAware.java
index 24c44a14f0518679bb874747797bedd76b23286d,076b3030c4cc907b2342b1e25415c5dc7b8b4777..5970f5a6856d7cd451f05087dd267b02c8dd7a6b
--- 1/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronPortAware.java
--- 2/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronPortAware.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronPortAware.java
@@@ -94,11 -90,10 +94,11 @@@ public class NeutronPortAware implement
      private static final String DEVICE_OWNER_ROUTER_IFACE = "network:router_interface";
      private static final String DEVICE_OWNER_ROUTER_GATEWAY = "network:router_gateway";
      private static final String DEVICE_OWNER_FLOATING_IP = "network:floatingip";
-     private static final int DHCP_CLIENT_PORT = 68;
      private static final int DHCP_SERVER_PORT = 67;
+     private static final int DNS_SERVER_PORT = 53;
      private final DataBroker dataProvider;
      private final EndpointService epService;
 +    private final static Map<String, UniqueId> floatingIpPortByDeviceId = new HashMap<>();
  
      public NeutronPortAware(DataBroker dataProvider, EndpointService epService) {
          this.dataProvider = checkNotNull(dataProvider);