Revert "Bug 3773: L2 EP is missing L3 Context + IP."

This reverts commit b39be843c7c41c13c3e5e053aa8f90ca9f572ae5.

Change-Id: I6b5a748c3838e982d8be0d23e1c09f05009f6c4b
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
(cherry picked from commit 2a7626f09ca3953b21a3412c7c6b212afa6e309f)

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/arp/ArpTasker.java b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/arp/ArpTasker.java
index 2689fa9dce98e5a4d9f47e45cde043599b4b37da..c881db5bd740b6f5748c3d14ada033f0f8965d23 100644 (file)
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/arp/ArpTasker.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/arp/ArpTasker.java
@@ -11,7 +11,6 @@ package org.opendaylight.groupbasedpolicy.renderer.ofoverlay.arp;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.math.BigInteger;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
@@ -65,7 +64,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.NetworkDomainId;
 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.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.EndpointBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.EndpointKey;
@@ -190,10 +188,6 @@ public class ArpTasker implements PacketProcessingListener {
         if (l2BdId != null) {
             updatedL3Ep = updatedL3EpBuilder.setL2Context(l2BdId).build();
             EndpointBuilder newEpBuilder = new EndpointBuilder(updatedL3Ep).setKey(new EndpointKey(l2BdId, sha));
-            L3AddressBuilder l3AddressBuilder = new L3AddressBuilder();
-            l3AddressBuilder.setIpAddress(updatedL3Ep.getIpAddress())
-                .setL3Context(updatedL3Ep.getL3Context());
-            newEpBuilder.setL3Address(Arrays.asList(l3AddressBuilder.build()));
             OfOverlayL3Context augmentation = updatedL3Ep.getAugmentation(OfOverlayL3Context.class);
             if (augmentation != null) {
                 newEpBuilder.addAugmentation(OfOverlayContext.class, new OfOverlayContextBuilder(augmentation).build());