ELAN Group-Id fetch issue fix

Issue:
=====
Some of the ELAN group ID retrieval it uses .toJava() util
which has to be removed.

Solution:
=========
Removed toJava() to longValue() method

Signed-off-by: Karthikeyan Krishnan <karthikeyangceb007@gmail.com>
Change-Id: I00165714c858efbd719196e65fab10cbc0cf6a91

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java
index a0f22ac4cbd60ab746b0a1c75c3f29c7ab20688c..f2ef480a37bb4b1855ab04d73716ff0aeb8707de 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java
@@ -85,7 +85,7 @@ public class ElanGroupListener extends AbstractClusteredAsyncDataTreeChangeListe
             if (elanInstance.getElanTag() != null) {
                 long elanTag = elanInstance.getElanTag().longValue();
                 long elanBCGroupId = ElanUtils.getElanRemoteBroadCastGroupID(elanTag);
-                if (elanBCGroupId == update.getGroupId().getValue().toJava()) {
+                if (elanBCGroupId == update.getGroupId().getValue().longValue()) {
                     return elanInstance;
                 }
             }

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
index 9e04f6318f2bc6ca8ebe896d9dc5cc060bdd401d..6ca8efad74b0b9f7751d56161794def7582fb12c 100755 (executable)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
@@ -1716,7 +1716,7 @@ public class ElanUtils {
     public void syncUpdateGroup(Uint64 dpnId, Group newGroup, long delayTime,
                                 TypedWriteTransaction<Datastore.Configuration> confTx) {
         Node nodeDpn = buildDpnNode(dpnId);
-        long groupIdInfo = newGroup.getGroupId().getValue().toJava();
+        long groupIdInfo = newGroup.getGroupId().getValue().longValue();
         GroupKey groupKey = new GroupKey(new GroupId(groupIdInfo));
         InstanceIdentifier<Group> groupInstanceId = InstanceIdentifier.builder(Nodes.class)
                 .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class)
@@ -1764,7 +1764,7 @@ public class ElanUtils {
                 .map(bucketWithoutId -> TO_BUCKET_WITH_ID.apply(bucketWithoutId, bucketIdValue))
                 .collect(Collectors.toList());
 
-        Group group = MDSALUtil.buildGroup(newGroup.getGroupId().getValue().toJava(), newGroup.getGroupName(),
+        Group group = MDSALUtil.buildGroup(newGroup.getGroupId().getValue().longValue(), newGroup.getGroupName(),
                 GroupTypes.GroupAll, MDSALUtil.buildBucketLists(bucketsToBeAdded));
         mdsalManager.addGroup(confTx, dpnId, group);
         LOG.trace("Installed remote BC group for node {} with group {}", nodeDpn, group);