Bug 3622: Allow empty (non-null) getGatewayPortId and tenantId values for router

Change-Id: I21bc5fd2f3b4feb13e6494bd93476f85c8ca37f7
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
index bb33294830015beb6542cd4623f63dd433fddb51..5993162ac4b8d1f71042481084063d70c5fa2fe2 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
@@ -154,13 +154,13 @@ public class NeutronRouterInterface extends  AbstractNeutronInterface<Router, Ne
         if (router.getName() != null) {
             routerBuilder.setName(router.getName());
         }
-        if (router.getTenantID() != null) {
+        if (router.getTenantID() != null && !router.getTenantID().isEmpty()) {
             routerBuilder.setTenantId(toUuid(router.getTenantID()));
         }
         if (router.getStatus() != null) {
             routerBuilder.setStatus(router.getStatus());
         }
-        if (router.getGatewayPortId() != null) {
+        if (router.getGatewayPortId() != null && !router.getGatewayPortId().isEmpty()) {
             routerBuilder.setGatewayPortId(toUuid(router.getGatewayPortId()));
         }
         routerBuilder.setAdminStateUp(router.getAdminStateUp());