fix registerEndpoint in port delete for base Eps

[groupbasedpolicy.git] / neutron-mapper / src / main / java / org / opendaylight / groupbasedpolicy / neutron / mapper / mapping / NeutronPortAware.java

diff --git a/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
index 7901f8f1d229208d3487c3f8fa4a96be9cee6b7e..951d593855cb71a5ea6100032871f10f74492419 100644 (file)
--- a/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
@@ -377,8 +377,7 @@ public class NeutronPortAware implements NeutronAware<Port> {
                             createBasicMacAddrEpInputBuilder(portInSameSubnet, networkContainment, endpointGroupIds);
                     AddressEndpointRegBuilder l3BaseEp = createBasicL3AddrEpInputBuilder(portInSameSubnet,
                             networkContainment, endpointGroupIds, neutron);
-                    ContextId resolvedCtxId = l3BaseEp.getContextId();
-                    ContextId networkCtxId = new ContextId(portInSameSubnet.getNetworkId().getValue());
+
                     setParentChildRelationshipForEndpoints(l3BaseEp, l2BaseEp);
                     AddressEndpointUnregBuilder addrEpUnreg =
                             new AddressEndpointUnregBuilder().setAddress(l3BaseEp.getAddress())
@@ -395,6 +394,7 @@ public class NeutronPortAware implements NeutronAware<Port> {
                     } else {
                         l3BaseEp.setContextId(new ContextId(networkId.getValue()));
                     }
+                    setParentChildRelationshipForEndpoints(l3BaseEp, l2BaseEp);
                     RegisterEndpointInput regBaseEpInput = new RegisterEndpointInputBuilder()
                         .setAddressEndpointReg(ImmutableList.of(l2BaseEp.build(), l3BaseEp.build())).build();
                     epRegistrator.registerEndpoint(regBaseEpInput);