From 00a0dae4489ccb6127d0e6f0bc6b9a97169b66af Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 9 Jul 2018 11:11:49 +0200
Subject: [PATCH] Fix union use issues

PortTranslatorUtilTest is using invalid port number, fix that.
PortUpdateTranslator attempted to create an invalid union, where
both members are null, fix that by checking if there is a port
number present.

Change-Id: Ieaae6eaadd397e990e813d429bb104ad4db13240
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../impl/translator/PortUpdateTranslator.java               | 6 +++++-
 .../openflowplugin/impl/util/PortTranslatorUtilTest.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslator.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslator.java
index 686744c508..baec4d961e 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslator.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslator.java
@@ -57,7 +57,11 @@ public class PortUpdateTranslator implements MessageTranslator<PortGrouping, Flo
         builder.setHardwareAddress(input.getHwAddr());
         builder.setMaximumSpeed(input.getMaxSpeed());
         builder.setName(input.getName());
-        builder.setPortNumber(new PortNumberUni(input.getPortNo()));
+
+        final Long portNo = input.getPortNo();
+        if (portNo != null) {
+            builder.setPortNumber(new PortNumberUni(portNo));
+        }
 
         return builder.build();
     }
diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtilTest.java
index c14803e5cc..3a8e57c633 100644
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtilTest.java
@@ -102,7 +102,7 @@ public class PortTranslatorUtilTest {
         Short version = OpenflowVersion.OF10.getVersion();
 
         BigInteger dataPathId = BigInteger.ONE;
-        Long portNumber = Long.MAX_VALUE;
+        Long portNumber = 4294967295L;
         PortGrouping portGrouping = mockPortGrouping();
 
         NodeConnectorUpdated nodeConnectorUpdated = PortTranslatorUtil
-- 
2.36.6