Neutron-mapper uses only DTOs from neutron.yang
[groupbasedpolicy.git] / neutron-mapper / src / main / java / org / opendaylight / groupbasedpolicy / neutron / mapper / mapping / NeutronPortAware.java
index 4f391e3be5cd9d1999308f62054d99c952d9ebb5..e8cede6ee766e6b3018c0d12c55f1e962ea90157 100644 (file)
@@ -10,568 +10,335 @@ package org.opendaylight.groupbasedpolicy.neutron.mapper.mapping;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
+
+import javax.annotation.Nullable;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.groupbasedpolicy.neutron.mapper.util.DataStoreHelper;
-import org.opendaylight.groupbasedpolicy.neutron.mapper.util.IidFactory;
-import org.opendaylight.groupbasedpolicy.neutron.mapper.util.MappingUtils;
-import org.opendaylight.groupbasedpolicy.neutron.mapper.util.MappingUtils.ForwardingCtx;
-import org.opendaylight.groupbasedpolicy.neutron.mapper.util.NeutronUtils;
-import org.opendaylight.groupbasedpolicy.neutron.mapper.util.Utils;
-import org.opendaylight.neutron.spi.INeutronPortAware;
-import org.opendaylight.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.spi.NeutronSecurityGroup;
-import org.opendaylight.neutron.spi.NeutronSecurityRule;
-import org.opendaylight.neutron.spi.Neutron_IPs;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
+import org.opendaylight.groupbasedpolicy.neutron.gbp.util.NeutronGbpIidFactory;
+import org.opendaylight.groupbasedpolicy.neutron.mapper.EndpointRegistrator;
+import org.opendaylight.groupbasedpolicy.neutron.mapper.infrastructure.NetworkClient;
+import org.opendaylight.groupbasedpolicy.neutron.mapper.infrastructure.NetworkService;
+import org.opendaylight.groupbasedpolicy.neutron.mapper.util.PortUtils;
+import org.opendaylight.groupbasedpolicy.neutron.mapper.util.SubnetUtils;
+import org.opendaylight.groupbasedpolicy.util.DataStoreHelper;
+import org.opendaylight.groupbasedpolicy.util.IidFactory;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.EndpointGroupId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.L2BridgeDomainId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.L2FloodDomainId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.L3ContextId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.Name;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.SubnetId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.TenantId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.UniqueId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.EndpointService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.RegisterEndpointInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.RegisterEndpointInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.UnregisterEndpointInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.UnregisterEndpointInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoint.fields.L3Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoint.fields.L3AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.Endpoint;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.EndpointKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L2Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L3;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L3Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.gbp.by.neutron.mappings.endpoints.by.ports.EndpointByPort;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.gbp.by.neutron.mappings.endpoints.by.ports.EndpointByPortBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.neutron.by.gbp.mappings.ports.by.endpoints.PortByEndpoint;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.neutron.by.gbp.mappings.ports.by.endpoints.PortByEndpointBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayContextInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayContextInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.EndpointGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.Subnet;
-import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.forwarding.context.L2BridgeDomain;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.forwarding.context.L2BridgeDomainBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.port.attributes.FixedIps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
-import com.google.common.base.Strings;
-import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 
-public class NeutronPortAware implements INeutronPortAware {
+public class NeutronPortAware implements NeutronAware<Port> {
 
-    public static final Logger LOG = LoggerFactory.getLogger(NeutronPortAware.class);
-    private static final String DEVICE_OWNER_DHCP = "network:dhcp";
-    private static final String DEVICE_OWNER_ROUTER_IFACE = "network:router_interface";
-    private static final int DHCP_CLIENT_PORT = 68;
-    private static final int DHCP_SERVER_PORT = 67;
+    private static final Logger LOG = LoggerFactory.getLogger(NeutronPortAware.class);
+    public static final InstanceIdentifier<Port> PORT_WILDCARD_IID =
+            InstanceIdentifier.builder(Neutron.class).child(Ports.class).child(Port.class).build();
     private final DataBroker dataProvider;
-    private final EndpointService epService;
+    private final EndpointRegistrator epRegistrator;
 
-    public NeutronPortAware(DataBroker dataProvider, EndpointService epService) {
+    public NeutronPortAware(DataBroker dataProvider, EndpointRegistrator epRegistrator) {
         this.dataProvider = checkNotNull(dataProvider);
-        this.epService = checkNotNull(epService);
+        this.epRegistrator = checkNotNull(epRegistrator);
     }
 
-    /**
-     * @see org.opendaylight.neutron.spi.INeutronPortAware#canCreatePort(org.opendaylight.neutron.spi.NeutronPort)
-     */
     @Override
-    public int canCreatePort(NeutronPort port) {
-        LOG.trace("canCreatePort - {}", port);
-        // TODO Li msunal this has to be rewrite when OFOverlay renderer will support l3-endpoints.
-        List<Neutron_IPs> fixedIPs = port.getFixedIPs();
-        if (fixedIPs != null && fixedIPs.size() > 1) {
-            LOG.warn("Neutron mapper does not support multiple IPs on the same port.");
-            return StatusCode.BAD_REQUEST;
-        }
-        return StatusCode.OK;
-    }
-
-    /**
-     * @see org.opendaylight.neutron.spi.INeutronPortAware#neutronPortCreated(org.opendaylight.neutron.spi.NeutronPort)
-     */
-    @Override
-    public void neutronPortCreated(NeutronPort port) {
-        LOG.trace("neutronPortCreated - {}", port);
-        if (isRouterInterfacePort(port)) {
-            LOG.trace("Port is router interface - {} does nothing. {} handles router iface.",
-                    NeutronPortAware.class.getSimpleName(), NeutronRouterAware.class.getSimpleName());
-            return;
-        }
-        ReadWriteTransaction rwTx = dataProvider.newReadWriteTransaction();
-        TenantId tenantId = new TenantId(Utils.normalizeUuid(port.getTenantID()));
-        if (isDhcpPort(port)) {
-            LOG.trace("Port is DHCP port.");
-            List<NeutronSecurityRule> dhcpSecRules = createDhcpSecRules(port, null, rwTx);
-            if (dhcpSecRules == null) {
-                rwTx.cancel();
+    public void onCreated(Port port, Neutron neutron) {
+        LOG.trace("created port - {}", port);
+        if (PortUtils.isRouterInterfacePort(port)) {
+            LOG.trace("Port is router interface port: {}", port.getUuid().getValue());
+            // router interface port can have only one IP
+            Optional<FixedIps> potentialPortIpWithSubnet = PortUtils.resolveFirstFixedIps(port);
+            if (!potentialPortIpWithSubnet.isPresent()) {
+                LOG.warn("Illegal state - router interface port does not contain fixed IPs {}",
+                        port);
                 return;
             }
-
-            for (NeutronSecurityRule dhcpSecRule : dhcpSecRules) {
-                boolean isDhcpSecRuleAdded = NeutronSecurityRuleAware.addNeutronSecurityRule(dhcpSecRule, rwTx);
-                if (!isDhcpSecRuleAdded) {
-                    rwTx.cancel();
-                    return;
-                }
+            FixedIps portIpWithSubnet = potentialPortIpWithSubnet.get();
+            L3ContextId routerL3Context = new L3ContextId(port.getDeviceId());
+            // change L3Context for all EPs with same subnet as router port
+            changeL3ContextForEpsInSubnet(portIpWithSubnet.getSubnetId(), neutron.getPorts(), routerL3Context);
+            // set L3Context as parent for bridge domain which is parent of subnet
+            TenantId tenantId = new TenantId(port.getTenantId().getValue());
+            Optional<Subnet> potentialRouterPortSubnet = SubnetUtils.findSubnet(portIpWithSubnet.getSubnetId(), neutron.getSubnets());
+            if (!potentialRouterPortSubnet.isPresent()) {
+                LOG.warn("Illegal state - router interface port is in subnet which does not exist. {}",
+                        port);
+                return;
             }
-        } else {
-            List<NeutronSecurityGroup> secGroups = port.getSecurityGroups();
-            if (secGroups != null) {
-                for (NeutronSecurityGroup secGroup : secGroups) {
-                    EndpointGroupId epgId = new EndpointGroupId(secGroup.getSecurityGroupUUID());
-                    Optional<EndpointGroup> potentialEpg = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
-                            IidFactory.endpointGroupIid(tenantId, epgId), rwTx);
-                    if (!potentialEpg.isPresent()) {
-                        boolean isSecGroupCreated = NeutronSecurityGroupAware.addNeutronSecurityGroup(secGroup, rwTx);
-                        if (!isSecGroupCreated) {
-                            rwTx.cancel();
-                            return;
-                        }
-                        if (containsSecRuleWithRemoteSecGroup(secGroup)) {
-                            List<NeutronSecurityRule> dhcpSecRules = createDhcpSecRules(port, epgId, rwTx);
-                            if (dhcpSecRules == null) {
-                                rwTx.cancel();
-                                return;
-                            }
-                            List<NeutronSecurityRule> routerSecRules = NeutronRouterAware.createRouterSecRules(port, epgId, rwTx);
-                            if (routerSecRules == null) {
-                                rwTx.cancel();
-                                return;
-                            }
-                        }
-                    } else {
-                        List<NeutronSecurityRule> secRules = secGroup.getSecurityRules();
-                        if (secRules != null) {
-                            for (NeutronSecurityRule secRule : secRules) {
-                                NeutronSecurityRuleAware.addNeutronSecurityRule(secRule, rwTx);
-                            }
-                        }
-                    }
-                }
+            ReadWriteTransaction rwTx = dataProvider.newReadWriteTransaction();
+            Subnet routerPortSubnet = potentialRouterPortSubnet.get();
+            L2BridgeDomainId l2BdId = new L2BridgeDomainId(routerPortSubnet.getNetworkId().getValue());
+            L2BridgeDomain l2Bd = new L2BridgeDomainBuilder().setId(l2BdId).setParent(routerL3Context).build();
+            rwTx.merge(LogicalDatastoreType.CONFIGURATION, IidFactory.l2BridgeDomainIid(tenantId, l2BdId), l2Bd);
+            // set virtual router IP for subnet
+            org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.forwarding.context.Subnet subnet =
+                    NeutronSubnetAware.createSubnet(routerPortSubnet, portIpWithSubnet.getIpAddress());
+            rwTx.merge(LogicalDatastoreType.CONFIGURATION, IidFactory.subnetIid(tenantId, subnet.getId()), subnet);
+            DataStoreHelper.submitToDs(rwTx);
+        } else if (PortUtils.isDhcpPort(port)) {
+            // process as normal port but put it to DHCP group
+            LOG.trace("Port is DHCP port: {}", port.getUuid().getValue());
+            Optional<FixedIps> firstFixedIps = PortUtils.resolveFirstFixedIps(port);
+            if (!firstFixedIps.isPresent()) {
+                LOG.warn("DHCP port does not have an IP address. {}", port);
+                return;
             }
-        }
-
-        boolean isNeutronPortCreated = addNeutronPort(port, rwTx, epService);
-        if (!isNeutronPortCreated) {
-            rwTx.cancel();
-            return;
-        }
-
-        DataStoreHelper.submitToDs(rwTx);
-    }
-
-    public static boolean addNeutronPort(NeutronPort port, ReadWriteTransaction rwTx, EndpointService epService) {
-        TenantId tenantId = new TenantId(Utils.normalizeUuid(port.getTenantID()));
-        L2FloodDomainId l2FdId = new L2FloodDomainId(port.getNetworkUUID());
-        ForwardingCtx fwCtx = MappingUtils.createForwardingContext(tenantId, l2FdId, rwTx);
-        boolean isFwCtxValid = validateForwardingCtx(fwCtx);
-        if (!isFwCtxValid) {
-            return false;
-        }
-        EndpointKey epKey = new EndpointKey(fwCtx.getL2BridgeDomain().getId(), new MacAddress(port.getMacAddress()));
-        UniqueId portId = new UniqueId(port.getID());
-        EndpointByPort endpointByPort = createEndpointByPort(epKey, portId);
-        rwTx.put(LogicalDatastoreType.OPERATIONAL, IidFactory.endpointByPortIid(portId), endpointByPort);
-        PortByEndpoint portByEndpoint = createPortByEndpoint(portId, epKey);
-        rwTx.put(LogicalDatastoreType.OPERATIONAL,
-                IidFactory.portByEndpointIid(epKey.getL2Context(), epKey.getMacAddress()), portByEndpoint);
-
-        try {
-            RegisterEndpointInput registerEpRpcInput = createRegisterEndpointInput(port, fwCtx);
-
-            RpcResult<Void> rpcResult = epService.registerEndpoint(registerEpRpcInput).get();
-            if (!rpcResult.isSuccessful()) {
-                LOG.warn("Illegal state - RPC registerEndpoint failed. Input of RPC: {}", registerEpRpcInput);
-                return false;
+            RegisterEndpointInputBuilder epInBuilder = createBasicEndpointInputBuilder(port);
+            // endpoint has only one network containment therefore only first IP is used
+            FixedIps ipWithSubnet = firstFixedIps.get();
+            epInBuilder.setNetworkContainment(new SubnetId(ipWithSubnet.getSubnetId().getValue()));
+            L3Address l3Address = new L3AddressBuilder().setL3Context(new L3ContextId(port.getNetworkId().getValue()))
+                .setIpAddress(ipWithSubnet.getIpAddress())
+                .build();
+            epInBuilder.setL3Address(ImmutableList.of(l3Address));
+            List<EndpointGroupId> epgsFromSecGroups = resolveEpgIdsFromSecGroups(port.getSecurityGroups());
+            epgsFromSecGroups.add(NetworkService.EPG_ID);
+            epInBuilder.setEndpointGroups(epgsFromSecGroups);
+            registerEndpointAndStoreMapping(epInBuilder.build(), port);
+        } else if (PortUtils.isNormalPort(port)) {
+            LOG.trace("Port is normal port: {}", port.getUuid().getValue());
+            RegisterEndpointInputBuilder epInBuilder = createBasicEndpointInputBuilder(port);
+            Optional<FixedIps> firstFixedIps = PortUtils.resolveFirstFixedIps(port);
+            if (firstFixedIps.isPresent()) {
+                // endpoint has only one network containment therefore only first IP is used
+                FixedIps ipWithSubnet = firstFixedIps.get();
+                epInBuilder.setNetworkContainment(new SubnetId(ipWithSubnet.getSubnetId().getValue()));
+                L3Address l3Address = resolveL3AddressFromPort(port, ipWithSubnet, neutron);
+                epInBuilder.setL3Address(ImmutableList.of(l3Address));
+            } else {
+                epInBuilder.setNetworkContainment(new L2FloodDomainId(port.getNetworkId().getValue()));
             }
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("addPort - RPC invocation failed.", e);
-            return false;
+            List<EndpointGroupId> epgsFromSecGroups = resolveEpgIdsFromSecGroups(port.getSecurityGroups());
+            epgsFromSecGroups.add(NetworkClient.EPG_ID);
+            epInBuilder.setEndpointGroups(epgsFromSecGroups);
+            registerEndpointAndStoreMapping(epInBuilder.build(), port);
+        } else if (PortUtils.isRouterGatewayPort(port)) {
+            // do nothing because actual trigger is attaching of port to router
+            LOG.trace("Port is router gateway port: {}", port.getUuid().getValue());
+        } else if (PortUtils.isFloatingIpPort(port)) {
+            // do nothing because trigger is floating IP
+            LOG.trace("Port is floating ip: {}", port.getUuid().getValue());
+        } else {
+            LOG.warn("Unknown port: {}", port);
         }
-        return true;
     }
 
-    private static boolean validateForwardingCtx(ForwardingCtx fwCtx) {
-        if (fwCtx.getL2FloodDomain() == null) {
-            LOG.warn("Illegal state - l2-flood-domain does not exist.");
-            return false;
-        }
-        if (fwCtx.getL2BridgeDomain() == null) {
-            LOG.warn("Illegal state - l2-bridge-domain does not exist.");
-            return false;
-        }
-        if (fwCtx.getL3Context() == null) {
-            LOG.warn("Illegal state - l3-context does not exist.");
-            return false;
+    private void changeL3ContextForEpsInSubnet(Uuid subnetUuid, Ports ports, L3ContextId newl3Context) {
+        Set<Port> portsInSameSubnet = PortUtils.findPortsBySubnet(subnetUuid, ports);
+        for (Port portInSameSubnet : portsInSameSubnet) {
+            if (PortUtils.isNormalPort(portInSameSubnet) || PortUtils.isDhcpPort(portInSameSubnet)) {
+                // endpoints are created only from neutron normal port or DHCP port
+                Optional<FixedIps> firstFixedIps = PortUtils.resolveFirstFixedIps(portInSameSubnet);
+                if (firstFixedIps.isPresent()) {
+                    // endpoint has only one network containment therefore only first IP is used
+                    FixedIps ipWithSubnet = firstFixedIps.get();
+                    RegisterEndpointInputBuilder epInBuilder = createBasicEndpointInputBuilder(portInSameSubnet);
+                    epInBuilder.setNetworkContainment(new SubnetId(ipWithSubnet.getSubnetId().getValue()));
+                    L3Address l3Address = new L3AddressBuilder().setL3Context(newl3Context)
+                        .setIpAddress(ipWithSubnet.getIpAddress())
+                        .build();
+                    epInBuilder.setL3Address(ImmutableList.of(l3Address));
+                    List<EndpointGroupId> epgsFromSecGroups =
+                            resolveEpgIdsFromSecGroups(portInSameSubnet.getSecurityGroups());
+                    epgsFromSecGroups.add(NetworkClient.EPG_ID);
+                    epRegistrator.registerEndpoint(epInBuilder.build());
+                    // unregister L3EP
+                    L3ContextId oldL3Context = new L3ContextId(portInSameSubnet.getNetworkId().getValue());
+                    L3 l3 = new L3Builder().setL3Context(oldL3Context).setIpAddress(ipWithSubnet.getIpAddress())
+                        .build();
+                    UnregisterEndpointInput epUnreg = new UnregisterEndpointInputBuilder().setL3(ImmutableList.of(l3)).build();
+                    epRegistrator.unregisterEndpoint(epUnreg);
+                }
+            }
         }
-        return true;
-    }
-
-    private static EndpointByPort createEndpointByPort(EndpointKey epKey, UniqueId portId) {
-        return new EndpointByPortBuilder().setPortId(portId)
-            .setL2Context(epKey.getL2Context())
-            .setMacAddress(epKey.getMacAddress())
-            .build();
     }
 
-    private static PortByEndpoint createPortByEndpoint(UniqueId portId, EndpointKey epKey) {
-        return new PortByEndpointBuilder().setPortId(portId)
-            .setL2Context(epKey.getL2Context())
-            .setMacAddress(epKey.getMacAddress())
-            .build();
+    private static RegisterEndpointInputBuilder createBasicEndpointInputBuilder(Port port) {
+        return new RegisterEndpointInputBuilder().setL2Context(new L2BridgeDomainId(port.getNetworkId().getValue()))
+            .setMacAddress(new MacAddress(port.getMacAddress()))
+            .setTenant(new TenantId(port.getTenantId().getValue()))
+            .setTimestamp(System.currentTimeMillis());
     }
 
-    private List<NeutronSecurityRule> createDhcpSecRules(NeutronPort port, EndpointGroupId consumerEpgId, ReadTransaction rTx) {
-        TenantId tenantId = new TenantId(Utils.normalizeUuid(port.getTenantID()));
-        Neutron_IPs firstIp = MappingUtils.getFirstIp(port.getFixedIPs());
-        if (firstIp == null) {
-            LOG.warn("Illegal state - DHCP port does not have an IP address.");
-            return null;
+    private static List<EndpointGroupId> resolveEpgIdsFromSecGroups(@Nullable List<Uuid> securityGroups) {
+        List<EndpointGroupId> epgIds = new ArrayList<>();
+        if ((securityGroups == null || securityGroups.isEmpty())) {
+            return epgIds;
         }
-        SubnetId dhcpSubnetId = new SubnetId(firstIp.getSubnetUUID());
-        Optional<Subnet> potentialSubnet = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
-                IidFactory.subnetIid(tenantId, dhcpSubnetId), rTx);
-        if (!potentialSubnet.isPresent()) {
-            LOG.warn("Illegal state - Subnet {} where is DHCP port does not exist.", dhcpSubnetId.getValue());
-            return null;
+        for (Uuid secGrp : securityGroups) {
+            epgIds.add(new EndpointGroupId(secGrp.getValue()));
         }
-        IpPrefix ipSubnet = potentialSubnet.get().getIpPrefix();
-        NeutronSecurityRule dhcpRuleEgress = createDhcpSecRule(port.getID(), tenantId, ipSubnet, consumerEpgId, true);
-        NeutronSecurityRule dhcpRuleIngress = createDhcpSecRule(port.getID(), tenantId, ipSubnet, consumerEpgId, false);
-        return ImmutableList.of(dhcpRuleEgress, dhcpRuleIngress);
+        return epgIds;
     }
 
-    private NeutronSecurityRule createDhcpSecRule(String ruleUuid, TenantId tenantId, IpPrefix ipSubnet, EndpointGroupId consumerEpgId,
-            boolean isEgress) {
-        NeutronSecurityRule dhcpSecRule = new NeutronSecurityRule();
-        dhcpSecRule.setSecurityRuleGroupID(MappingUtils.EPG_DHCP_ID.getValue());
-        dhcpSecRule.setSecurityRuleTenantID(tenantId.getValue());
-        dhcpSecRule.setSecurityRuleRemoteIpPrefix(Utils.getStringIpPrefix(ipSubnet));
-        if (consumerEpgId != null) {
-            dhcpSecRule.setSecurityRemoteGroupID(consumerEpgId.getValue());
+    private void registerEndpointAndStoreMapping(RegisterEndpointInput regEpInput, Port port) {
+        boolean isRegisteredEndpoint = epRegistrator.registerEndpoint(regEpInput);
+        if (isRegisteredEndpoint) {
+            ReadWriteTransaction rwTx = dataProvider.newReadWriteTransaction();
+            UniqueId portId = new UniqueId(port.getUuid().getValue());
+            EndpointKey epKey = new EndpointKey(new L2BridgeDomainId(port.getNetworkId().getValue()),
+                    new MacAddress(port.getMacAddress()));
+            LOG.trace("Adding Port-Endpoint mapping for port {} (device owner {}) and endpoint {}",
+                    port.getUuid().getValue(), port.getDeviceOwner(), epKey);
+            EndpointByPort endpointByPort = MappingFactory.createEndpointByPort(epKey, portId);
+            rwTx.put(LogicalDatastoreType.OPERATIONAL, NeutronGbpIidFactory.endpointByPortIid(portId), endpointByPort,
+                    true);
+            PortByEndpoint portByEndpoint = MappingFactory.createPortByEndpoint(portId, epKey);
+            rwTx.put(LogicalDatastoreType.OPERATIONAL,
+                    NeutronGbpIidFactory.portByEndpointIid(epKey.getL2Context(), epKey.getMacAddress()), portByEndpoint,
+                    true);
+            DataStoreHelper.submitToDs(rwTx);
         }
-        if (isEgress) {
-            dhcpSecRule.setSecurityRuleUUID(NeutronUtils.EGRESS + "__" + ruleUuid);
-            dhcpSecRule.setSecurityRuleDirection(NeutronUtils.EGRESS);
-            dhcpSecRule.setSecurityRulePortMin(DHCP_CLIENT_PORT);
-            dhcpSecRule.setSecurityRulePortMax(DHCP_CLIENT_PORT);
-        } else {
-            dhcpSecRule.setSecurityRuleUUID(NeutronUtils.INGRESS + "__" + ruleUuid);
-            dhcpSecRule.setSecurityRuleDirection(NeutronUtils.INGRESS);
-            dhcpSecRule.setSecurityRulePortMin(DHCP_SERVER_PORT);
-            dhcpSecRule.setSecurityRulePortMax(DHCP_SERVER_PORT);
-        }
-        dhcpSecRule.setSecurityRuleProtocol(NeutronUtils.UDP);
-        if (ipSubnet.getIpv4Prefix() != null) {
-            dhcpSecRule.setSecurityRuleEthertype(NeutronUtils.IPv4);
-        } else {
-            dhcpSecRule.setSecurityRuleEthertype(NeutronUtils.IPv6);
-        }
-        return dhcpSecRule;
     }
 
-    /**
-     * @see org.opendaylight.neutron.spi.INeutronPortAware#canUpdatePort(org.opendaylight.neutron.spi.NeutronPort,
-     *      org.opendaylight.neutron.spi.NeutronPort)
-     */
     @Override
-    public int canUpdatePort(NeutronPort delta, NeutronPort original) {
-        LOG.trace("canUpdatePort - delta: {} original: {}", delta, original);
-        if (delta.getFixedIPs() == null || delta.getFixedIPs().isEmpty()) {
-            return StatusCode.OK;
-        }
-        // TODO Li msunal this has to be rewrite when OFOverlay renderer will support l3-endpoints.
-        List<Neutron_IPs> fixedIPs = delta.getFixedIPs();
-        if (fixedIPs != null && fixedIPs.size() > 1) {
-            LOG.warn("Neutron mapper does not support multiple IPs on the same port.");
-            return StatusCode.BAD_REQUEST;
-        }
-        return StatusCode.OK;
+    public void onUpdated(Port oldPort, Port newPort, Neutron oldNeutron, Neutron newNeutron) {
+        LOG.trace("updated port - OLD: {}\nNEW: {}", oldPort, newPort);
+        onDeleted(oldPort, oldNeutron, newNeutron);
+        onCreated(newPort, newNeutron);
     }
 
-    /**
-     * @see org.opendaylight.neutron.spi.INeutronPortAware#neutronPortUpdated(org.opendaylight.neutron.spi.NeutronPort)
-     */
     @Override
-    public void neutronPortUpdated(NeutronPort port) {
-        LOG.trace("neutronPortUpdated - {}", port);
-        if (isRouterInterfacePort(port)) {
-            LOG.trace("Port is router interface - {} does nothing. {} handles router iface.",
-                    NeutronPortAware.class.getSimpleName(), NeutronRouterAware.class.getSimpleName());
-            return;
-        }
-        ReadOnlyTransaction rTx = dataProvider.newReadOnlyTransaction();
-        TenantId tenantId = new TenantId(Utils.normalizeUuid(port.getTenantID()));
-        MacAddress macAddress = new MacAddress(port.getMacAddress());
-        L2FloodDomainId l2FdId = new L2FloodDomainId(port.getNetworkUUID());
-        ForwardingCtx fwCtx = MappingUtils.createForwardingContext(tenantId, l2FdId, rTx);
-        boolean isFwCtxValid = validateForwardingCtx(fwCtx);
-        if (!isFwCtxValid) {
-            rTx.close();
-            return;
-        }
-
-        Optional<Endpoint> potentionalEp = DataStoreHelper.readFromDs(LogicalDatastoreType.OPERATIONAL,
-                IidFactory.endpointIid(fwCtx.getL2BridgeDomain().getId(), macAddress), rTx);
-        if (!potentionalEp.isPresent()) {
-            LOG.warn("Illegal state - endpoint {} does not exist.", new EndpointKey(fwCtx.getL2BridgeDomain().getId(),
-                    macAddress));
-            rTx.close();
-            return;
-        }
-
-        Endpoint ep = potentionalEp.get();
-        if (isEpIpDifferentThanPortFixedIp(ep, port) || isEpgDifferentThanSecGrp(ep, port)) {
-            UnregisterEndpointInput unregisterEpRpcInput = createUnregisterEndpointInput(ep);
-            RegisterEndpointInput registerEpRpcInput = createRegisterEndpointInput(port, fwCtx);
-            try {
-                RpcResult<Void> rpcResult = epService.unregisterEndpoint(unregisterEpRpcInput).get();
-                if (!rpcResult.isSuccessful()) {
-                    LOG.warn("Illegal state - RPC unregisterEndpoint failed. Input of RPC: {}", unregisterEpRpcInput);
-                    rTx.close();
-                    return;
-                }
-                rpcResult = epService.registerEndpoint(registerEpRpcInput).get();
-                if (!rpcResult.isSuccessful()) {
-                    LOG.warn("Illegal state - RPC registerEndpoint failed. Input of RPC: {}", registerEpRpcInput);
-                    rTx.close();
-                    return;
-                }
-            } catch (InterruptedException | ExecutionException e) {
-                LOG.error("addPort - RPC invocation failed.", e);
-                rTx.close();
+    public void onDeleted(Port port, Neutron oldNeutron, Neutron newNeutron) {
+        LOG.trace("deleted port - {}", port);
+        if (PortUtils.isRouterInterfacePort(port)) {
+            LOG.trace("Port is router interface port: {}", port.getUuid().getValue());
+            // router interface port can have only one IP
+            Optional<FixedIps> potentialPortIpWithSubnet = PortUtils.resolveFirstFixedIps(port);
+            if (!potentialPortIpWithSubnet.isPresent()) {
+                LOG.warn("Illegal state - router interface port does not contain fixed IPs {}",
+                        port);
                 return;
             }
-        }
-        rTx.close();
-    }
-
-    private boolean isEpIpDifferentThanPortFixedIp(Endpoint ep, NeutronPort port) {
-        List<L3Address> l3Addresses = ep.getL3Address();
-        List<Neutron_IPs> fixedIPs = port.getFixedIPs();
-        if ((l3Addresses == null || l3Addresses.isEmpty()) && (fixedIPs == null || fixedIPs.isEmpty())) {
-            return false;
-        }
-        if (l3Addresses != null && !l3Addresses.isEmpty() && fixedIPs != null && !fixedIPs.isEmpty()) {
-            if (fixedIPs.get(0).getIpAddress().equals(Utils.getStringIpAddress(l3Addresses.get(0).getIpAddress()))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean isEpgDifferentThanSecGrp(Endpoint ep, NeutronPort port) {
-        List<EndpointGroupId> epgIds = ep.getEndpointGroups();
-        List<NeutronSecurityGroup> secGroups = port.getSecurityGroups();
-        if ((epgIds == null || epgIds.isEmpty()) && (secGroups == null || secGroups.isEmpty())) {
-            return false;
-        }
-        if (epgIds != null && !epgIds.isEmpty() && secGroups != null && !secGroups.isEmpty()) {
-            if (epgIds.size() != secGroups.size()) {
-                return true;
-            }
-            Collection<EndpointGroupId> epgIdsFromSecGroups = Collections2.transform(secGroups,
-                    new Function<NeutronSecurityGroup, EndpointGroupId>() {
-
-                        @Override
-                        public EndpointGroupId apply(NeutronSecurityGroup input) {
-                            return new EndpointGroupId(input.getSecurityGroupUUID());
-                        }
-                    });
-            // order independent equals
-            Set<EndpointGroupId> one = new HashSet<>(epgIds);
-            Set<EndpointGroupId> two = new HashSet<>(epgIdsFromSecGroups);
-            if (one.equals(two)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @see org.opendaylight.neutron.spi.INeutronPortAware#canDeletePort(org.opendaylight.neutron.spi.NeutronPort)
-     */
-    @Override
-    public int canDeletePort(NeutronPort port) {
-        LOG.trace("canDeletePort - {}", port);
-        // nothing to consider
-        return StatusCode.OK;
-    }
-
-    /**
-     * @see org.opendaylight.neutron.spi.INeutronPortAware#neutronPortDeleted(org.opendaylight.neutron.spi.NeutronPort)
-     */
-    @Override
-    public void neutronPortDeleted(NeutronPort port) {
-        LOG.trace("neutronPortDeleted - {}", port);
-        if (isRouterInterfacePort(port)) {
-            LOG.trace("Port is router interface - {} does nothing. {} handles router iface.",
-                    NeutronPortAware.class.getSimpleName(), NeutronRouterAware.class.getSimpleName());
-            return;
-        }
-        ReadOnlyTransaction rTx = dataProvider.newReadOnlyTransaction();
-        TenantId tenantId = new TenantId(Utils.normalizeUuid(port.getTenantID()));
-        L2FloodDomainId l2FdId = new L2FloodDomainId(port.getNetworkUUID());
-        ForwardingCtx fwCtx = MappingUtils.createForwardingContext(tenantId, l2FdId, rTx);
-        boolean isFwCtxValid = validateForwardingCtx(fwCtx);
-        if (!isFwCtxValid) {
-            rTx.close();
-            return;
-        }
-
-        UnregisterEndpointInput unregisterEpRpcInput = createUnregisterEndpointInput(port, fwCtx);
-        try {
-            RpcResult<Void> rpcResult = epService.unregisterEndpoint(unregisterEpRpcInput).get();
-            if (!rpcResult.isSuccessful()) {
-                LOG.warn("Illegal state - RPC unregisterEndpoint failed. Input of RPC: {}", unregisterEpRpcInput);
+            FixedIps portIpWithSubnet = potentialPortIpWithSubnet.get();
+            L3ContextId l3Context = new L3ContextId(port.getNetworkId().getValue());
+            // change L3Context for all EPs with same subnet as router port
+            changeL3ContextForEpsInSubnet(portIpWithSubnet.getSubnetId(), oldNeutron.getPorts(), l3Context);
+            // set L3Context as parent for bridge domain which is parent of subnet
+            TenantId tenantId = new TenantId(port.getTenantId().getValue());
+            Optional<Subnet> potentialRouterPortSubnet = SubnetUtils.findSubnet(portIpWithSubnet.getSubnetId(), oldNeutron.getSubnets());
+            if (!potentialRouterPortSubnet.isPresent()) {
+                LOG.warn("Illegal state - router interface port is in subnet which does not exist. {}",
+                        port);
+                return;
             }
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("addPort - RPC invocation failed.", e);
-        } finally {
-            rTx.close();
+            ReadWriteTransaction rwTx = dataProvider.newReadWriteTransaction();
+            Subnet routerPortSubnet = potentialRouterPortSubnet.get();
+            L2BridgeDomainId l2BdId = new L2BridgeDomainId(routerPortSubnet.getNetworkId().getValue());
+            L2BridgeDomain l2Bd = new L2BridgeDomainBuilder().setId(l2BdId).setParent(l3Context).build();
+            rwTx.merge(LogicalDatastoreType.CONFIGURATION, IidFactory.l2BridgeDomainIid(tenantId, l2BdId), l2Bd);
+            // remove virtual router IP for subnet
+            org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.forwarding.context.Subnet subnet =
+                    NeutronSubnetAware.createSubnet(routerPortSubnet, null);
+            rwTx.put(LogicalDatastoreType.CONFIGURATION, IidFactory.subnetIid(tenantId, subnet.getId()), subnet);
+            DataStoreHelper.submitToDs(rwTx);
+        } else if (PortUtils.isDhcpPort(port)) {
+            LOG.trace("Port is DHCP port: {}", port.getUuid().getValue());
+            UnregisterEndpointInput unregEpInput = createUnregisterEndpointInput(port, oldNeutron);
+            unregisterEndpointAndRemoveMapping(unregEpInput, port);
+        } else if (PortUtils.isNormalPort(port)) {
+            LOG.trace("Port is normal port: {}", port.getUuid().getValue());
+            UnregisterEndpointInput unregEpInput = createUnregisterEndpointInput(port, oldNeutron);
+            unregisterEndpointAndRemoveMapping(unregEpInput, port);
+        } else if (PortUtils.isRouterGatewayPort(port)) {
+            // do nothing because actual trigger is detaching of port from router
+            LOG.trace("Port is router gateway port: {}", port.getUuid().getValue());
+        } else if (PortUtils.isFloatingIpPort(port)) {
+            // do nothing because trigger is floating IP
+            LOG.trace("Port is floating ip: {}", port.getUuid().getValue());
+        } else {
+            LOG.warn("Unknown port: {}", port);
         }
     }
 
-    private static RegisterEndpointInput createRegisterEndpointInput(NeutronPort port, ForwardingCtx fwCtx) {
-        List<EndpointGroupId> epgIds = new ArrayList<>();
-        // each EP has to be in EPG ANY, except dhcp and router
-        if (isDhcpPort(port)) {
-            epgIds.add(MappingUtils.EPG_DHCP_ID);
-        } else if (!containsSecRuleWithRemoteSecGroup(port.getSecurityGroups())) {
-            epgIds.add(MappingUtils.EPG_ANY_ID);
-        }
-
-        List<NeutronSecurityGroup> securityGroups = port.getSecurityGroups();
-        if ((securityGroups == null || securityGroups.isEmpty())) {
-            if (!isDhcpPort(port)) {
-                LOG.warn(
-                        "Port {} does not contain any security group. The port should belong to 'default' security group at least.",
-                        port.getPortUUID());
-            }
-        } else {
-            for (NeutronSecurityGroup secGrp : securityGroups) {
-                epgIds.add(new EndpointGroupId(secGrp.getSecurityGroupUUID()));
-            }
-        }
-        RegisterEndpointInputBuilder inputBuilder = new RegisterEndpointInputBuilder().setL2Context(
-                fwCtx.getL2BridgeDomain().getId())
+    private UnregisterEndpointInput createUnregisterEndpointInput(Port port, Neutron neutron) {
+        UnregisterEndpointInputBuilder inputBuilder = new UnregisterEndpointInputBuilder();
+        L2 l2Ep = new L2Builder().setL2Context(new L2BridgeDomainId(port.getNetworkId().getValue()))
             .setMacAddress(new MacAddress(port.getMacAddress()))
-            .setTenant(new TenantId(Utils.normalizeUuid(port.getTenantID())))
-            .setEndpointGroups(epgIds)
-            .addAugmentation(OfOverlayContextInput.class,
-                    new OfOverlayContextInputBuilder().setPortName(createTapPortName(port)).build())
-            .setTimestamp(System.currentTimeMillis());
-        List<Neutron_IPs> fixedIPs = port.getFixedIPs();
-        // TODO Li msunal this getting of just first IP has to be rewrite when OFOverlay renderer
-        // will support l3-endpoints. Then we will register L2 and L3 endpoints separately.
-        Neutron_IPs firstIp = MappingUtils.getFirstIp(fixedIPs);
-        if (firstIp != null) {
-            inputBuilder.setNetworkContainment(new SubnetId(firstIp.getSubnetUUID()));
-            L3Address l3Address = new L3AddressBuilder().setIpAddress(Utils.createIpAddress(firstIp.getIpAddress()))
-                .setL3Context(fwCtx.getL3Context().getId())
+            .build();
+        inputBuilder.setL2(ImmutableList.of(l2Ep));
+        // we've registered EP with only first IP so remove only EP with first IP
+        Optional<FixedIps> potentialFirstIp = PortUtils.resolveFirstFixedIps(port);
+        if (!potentialFirstIp.isPresent()) {
+            FixedIps firstIp = potentialFirstIp.get();
+            L3Address l3Address = resolveL3AddressFromPort(port, firstIp, neutron);
+            L3 l3 = new L3Builder().setIpAddress(l3Address.getIpAddress())
+                .setL3Context(l3Address.getL3Context())
                 .build();
-            inputBuilder.setL3Address(ImmutableList.of(l3Address));
-        }
-        if (!Strings.isNullOrEmpty(port.getName())) {
-
+            inputBuilder.setL3(ImmutableList.of(l3));
         }
         return inputBuilder.build();
     }
 
-    private static boolean containsSecRuleWithRemoteSecGroup(List<NeutronSecurityGroup> secGroups) {
-        if (secGroups == null) {
-            return false;
-        }
-        for (NeutronSecurityGroup secGroup : secGroups) {
-            boolean containsSecRuleWithRemoteSecGroup = containsSecRuleWithRemoteSecGroup(secGroup);
-            if (containsSecRuleWithRemoteSecGroup) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean containsSecRuleWithRemoteSecGroup(NeutronSecurityGroup secGroup) {
-        List<NeutronSecurityRule> secRules = secGroup.getSecurityRules();
-        if (secRules == null) {
-            return false;
+    private void unregisterEndpointAndRemoveMapping(UnregisterEndpointInput unregEpInput, Port port) {
+        boolean isUnregisteredEndpoint = epRegistrator.unregisterEndpoint(unregEpInput);
+        if (isUnregisteredEndpoint) {
+            ReadWriteTransaction rwTx = dataProvider.newReadWriteTransaction();
+            UniqueId portId = new UniqueId(port.getUuid().getValue());
+            EndpointKey epKey = new EndpointKey(new L2BridgeDomainId(port.getNetworkId().getValue()),
+                    new MacAddress(port.getMacAddress()));
+            LOG.trace("Removing Port-Endpoint mapping for port {} (device owner {}) and endpoint {}",
+                    port.getUuid().getValue(), port.getDeviceOwner(), epKey);
+            DataStoreHelper.removeIfExists(LogicalDatastoreType.OPERATIONAL,
+                    NeutronGbpIidFactory.endpointByPortIid(portId), rwTx);
+            DataStoreHelper.removeIfExists(LogicalDatastoreType.OPERATIONAL,
+                    NeutronGbpIidFactory.portByEndpointIid(epKey.getL2Context(), epKey.getMacAddress()), rwTx);
+            DataStoreHelper.submitToDs(rwTx);
         }
-        for (NeutronSecurityRule secRule : secRules) {
-            if (!Strings.isNullOrEmpty(secRule.getSecurityRemoteGroupID())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static Name createTapPortName(NeutronPort port) {
-        return new Name("tap" + port.getID().substring(0, 11));
-    }
-
-    private static boolean isDhcpPort(NeutronPort port) {
-        return DEVICE_OWNER_DHCP.equals(port.getDeviceOwner());
-    }
-
-    private static boolean isRouterInterfacePort(NeutronPort port) {
-        return DEVICE_OWNER_ROUTER_IFACE.equals(port.getDeviceOwner());
     }
 
-    private UnregisterEndpointInput createUnregisterEndpointInput(Endpoint ep) {
-        UnregisterEndpointInputBuilder inputBuilder = new UnregisterEndpointInputBuilder();
-        L2 l2Ep = new L2Builder().setL2Context(ep.getL2Context()).setMacAddress(ep.getMacAddress()).build();
-        inputBuilder.setL2(ImmutableList.of(l2Ep));
-        // TODO Li msunal this has to be rewrite when OFOverlay renderer will support l3-endpoints.
-        // Endpoint probably will not have l3-addresses anymore, because L2 and L3 endpoints should
-        // be registered separately.
-        if (ep.getL3Address() != null && !ep.getL3Address().isEmpty()) {
-            List<L3> l3Eps = new ArrayList<>();
-            for (L3Address ip : ep.getL3Address()) {
-                l3Eps.add(new L3Builder().setL3Context(ip.getL3Context()).setIpAddress(ip.getIpAddress()).build());
+    private static L3Address resolveL3AddressFromPort(Port port, FixedIps portFixedIPs, Neutron neutron) {
+        Set<Port> routerIfacePorts = PortUtils.findRouterInterfacePorts(neutron.getPorts());
+        for (Port routerIfacePort : routerIfacePorts) {
+            Uuid routerIfacePortSubnet = routerIfacePort.getFixedIps().get(0).getSubnetId();
+            // if port is in the same subnet as router interface then we want to use L3Context of
+            // router
+            if (portFixedIPs.getSubnetId().equals(routerIfacePortSubnet)) {
+                L3ContextId epL3ContextId = new L3ContextId(routerIfacePort.getDeviceId());
+                LOG.trace("Router interface port was found in the same subnet as port have {}", port);
+                return new L3AddressBuilder().setL3Context(epL3ContextId)
+                    .setIpAddress(portFixedIPs.getIpAddress())
+                    .build();
             }
-            inputBuilder.setL3(l3Eps);
         }
-        return inputBuilder.build();
-    }
-
-    private UnregisterEndpointInput createUnregisterEndpointInput(NeutronPort port, ForwardingCtx fwCtx) {
-        UnregisterEndpointInputBuilder inputBuilder = new UnregisterEndpointInputBuilder();
-        L2 l2Ep = new L2Builder().setL2Context(fwCtx.getL2BridgeDomain().getId())
-            .setMacAddress(new MacAddress(port.getMacAddress()))
+        return new L3AddressBuilder().setL3Context(new L3ContextId(port.getNetworkId().getValue()))
+            .setIpAddress(portFixedIPs.getIpAddress())
             .build();
-        inputBuilder.setL2(ImmutableList.of(l2Ep));
-        // TODO Li msunal this has to be rewrite when OFOverlay renderer will support l3-endpoints.
-        // Endpoint probably will not have l3-addresses anymore, because L2 and L3 endpoints should
-        // be registered separately.
-        if (port.getFixedIPs() != null && !port.getFixedIPs().isEmpty()) {
-            inputBuilder.setL3(createL3s(port.getFixedIPs(), fwCtx.getL3Context().getId()));
-        }
-        return inputBuilder.build();
-    }
-
-    private List<L3> createL3s(List<Neutron_IPs> neutronIps, L3ContextId l3ContextId) {
-        List<L3> l3s = new ArrayList<>();
-        for (Neutron_IPs fixedIp : neutronIps) {
-            String ip = fixedIp.getIpAddress();
-            L3 l3 = new L3Builder().setIpAddress(Utils.createIpAddress(ip)).setL3Context(l3ContextId).build();
-            l3s.add(l3);
-        }
-        return l3s;
     }
 
 }