Omitting group-id from DS:dpn-teps-state

Change-Id: Idbee55d52f7d247ba0fc42ec3e1ad3d8d45bd5bc
Signed-off-by: Edw7n <n.edwin.anthony@ericsson.com>

diff --git a/itm/itm-api/src/main/java/org/opendaylight/genius/itm/utils/DpnTepInterfaceInfo.java b/itm/itm-api/src/main/java/org/opendaylight/genius/itm/utils/DpnTepInterfaceInfo.java
index 4bb04a42ad89b743bb966fef31f4201bedd1f115..cb6a672593a9eba9798bb8eb57804a5b2e6e6a23 100644 (file)
--- a/itm/itm-api/src/main/java/org/opendaylight/genius/itm/utils/DpnTepInterfaceInfo.java
+++ b/itm/itm-api/src/main/java/org/opendaylight/genius/itm/utils/DpnTepInterfaceInfo.java
@@ -17,8 +17,6 @@ public interface DpnTepInterfaceInfo {
 
     Class<? extends TunnelTypeBase> getTunnelType();
 
-    long getGroupId();
-
     String getTunnelName();
 
     boolean isMonitoringEnabled();

diff --git a/itm/itm-api/src/main/yang/itm-state.yang b/itm/itm-api/src/main/yang/itm-state.yang
index ca2e02721e98757ee520d27f379a5427525ea0e0..4ed3bbd24057fcfd3e28c7a08d4b5805881a3a5c 100644 (file)
--- a/itm/itm-api/src/main/yang/itm-state.yang
+++ b/itm/itm-api/src/main/yang/itm-state.yang
@@ -256,11 +256,6 @@ module itm-state {
                 mandatory true;
             }
 
-            leaf group-id {
-                type uint32;
-                mandatory true;
-            }
-
             /* Remote DPNs to which this DPN-Tep has a tunnel */
             list remote-dpns {
                 key "destination-dpn-id";

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cache/DpnTepStateCache.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cache/DpnTepStateCache.java
index fc0a4b49aa18cb0f1824cb06167bc837e693e3b8..3fe11eab42a72b8c675f4b1d7a2feb7ae6d93d42 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cache/DpnTepStateCache.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cache/DpnTepStateCache.java
@@ -67,7 +67,6 @@ public class DpnTepStateCache extends DataObjectCache<BigInteger, DpnsTeps> {
             final String dpn = getDpnId(dpnsTeps.getSourceDpnId(), remoteDpns.getDestinationDpnId());
             DpnTepInterfaceInfo value = new DpnTepInterfaceInfoBuilder()
                     .setTunnelName(remoteDpns.getTunnelName())
-                    .setGroupId(dpnsTeps.getGroupId())
                     .setIsMonitoringEnabled(remoteDpns.isMonitoringEnabled())
                     .setIsInternal(remoteDpns.isInternal())
                     .setTunnelType(dpnsTeps.getTunnelType()).build();
@@ -99,7 +98,6 @@ public class DpnTepStateCache extends DataObjectCache<BigInteger, DpnsTeps> {
                     teps.getRemoteDpns().forEach(remoteDpns -> {
                         DpnTepInterfaceInfo value = new DpnTepInterfaceInfoBuilder()
                                 .setTunnelName(remoteDpns.getTunnelName())
-                                .setGroupId(teps.getGroupId())
                                 .setIsMonitoringEnabled(remoteDpns.isMonitoringEnabled())
                                 .setIsInternal(remoteDpns.isInternal())
                                 .setTunnelType(teps.getTunnelType()).build();

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java
index 9465f2909b1044bc59f1c075918005485086f9ce..50385d869627fdbfe617cb22ff633bb8de401fa0 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java
@@ -26,7 +26,6 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.genius.itm.cache.OvsBridgeRefEntryCache;
-import org.opendaylight.genius.itm.globals.ITMConstants;
 import org.opendaylight.genius.itm.impl.ITMBatchingUtils;
 import org.opendaylight.genius.itm.impl.ItmUtils;
 import org.opendaylight.genius.itm.impl.TunnelMonitoringConfig;
@@ -343,9 +342,6 @@ public final class ItmInternalTunnelAddWorker {
         dpnsTepsBuilder.setTunnelType(srcte.getTunnelType());
         dpnsTepsBuilder.setSourceDpnId(srcDpnId);
 
-        //ITM TEP INTERFACE set the group Id here ..later
-        Integer groupId = directTunnelUtils.allocateId(ITMConstants.ITM_IDPOOL_NAME, srcDpnId.toString());
-        dpnsTepsBuilder.setGroupId(groupId.longValue());
         RemoteDpnsBuilder remoteDpn = new RemoteDpnsBuilder();
         remoteDpn.withKey(new RemoteDpnsKey(dstDpnId));
         remoteDpn.setDestinationDpnId(dstDpnId);