Merge "Add Metering Create Tests for Bug 2546"

[neutron.git] / transcriber / src / main / java / org / opendaylight / neutron / transcriber / NeutronRouterInterface.java

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 5ac2bf44df3f9555b897cf04db266aa6027c4e96..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
@@ -127,8 +127,11 @@ public class NeutronRouterInterface extends  AbstractNeutronInterface<Router, Ne
             return false;
         }
         NeutronRouter target = routerDB.get(uuid);
-        updateMd(delta);
-        return overwrite(target, delta);
+        boolean rc = overwrite(target, delta);
+        if (rc) {
+            updateMd(routerDB.get(uuid));
+        }
+        return rc;
     }
 
     @Override
@@ -151,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());