Bug 4324: neutron port for router must allow empty string as tenant id

Patch set 2: complement toMd() by adding corresponding check on from Md()

Change-Id: Ifae54f92f85cc73e744a3b348d03fd7ddd290311
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
index c2fd1ee7ce55c351d49868fd8075102dbf7e5f37..3365f84afdb5255780f46e267a475ad8f87a467c 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
@@ -206,7 +206,9 @@ public class NeutronPortInterface extends AbstractNeutronInterface<Port, Neutron
             result.setSecurityGroups(groups);
         }
         result.setStatus(port.getStatus());
-        result.setTenantID(String.valueOf(port.getTenantId().getValue()).replace("-",""));
+        if (port.getTenantId() != null) {
+            result.setTenantID(String.valueOf(port.getTenantId().getValue()).replace("-", ""));
+        }
         result.setPortUUID(String.valueOf(port.getUuid().getValue()));
         addExtensions(port, result);
         return result;
@@ -299,7 +301,7 @@ public class NeutronPortInterface extends AbstractNeutronInterface<Port, Neutron
         if (neutronPort.getStatus() != null) {
             portBuilder.setStatus(neutronPort.getStatus());
         }
-        if (neutronPort.getTenantID() != null) {
+        if (neutronPort.getTenantID() != null && neutronPort.getTenantID() != "") {
             portBuilder.setTenantId(toUuid(neutronPort.getTenantID()));
         }
         if (neutronPort.getPortUUID() != null) {