commit 5b22f1121aa88b4ba10413a1e66ded6836252b81
author Jian Li <pyguni@gmail.com> Mon Oct 05 22:36:41 2020 +0900
committer Jian Li <pyguni@gmail.com> Sun Oct 11 01:24:40 2020 +0900
tree 33f8c3fee4bab17e4c0f18013885ce1587c65f4d
parent dd54d5657f40fbd9b2835f9776bedcaf51ff89e9

Fix: make all openstack resource name optional

Change-Id: I6f4fd34ab691701ea0d6a15eb77428c9e8f4e700

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRouterManager.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRouterManager.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRouterManager.java
index 19a831c..8280b1f 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRouterManager.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRouterManager.java
@@ -42,6 +42,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.deriveResourceName;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -110,17 +111,15 @@
     public void createRouter(Router osRouter) {
         checkNotNull(osRouter, ERR_NULL_ROUTER);
         checkArgument(!Strings.isNullOrEmpty(osRouter.getId()), ERR_NULL_ROUTER_ID);
-        checkArgument(!Strings.isNullOrEmpty(osRouter.getName()), ERR_NULL_ROUTER_NAME);
 
         osRouterStore.createRouter(osRouter);
-        log.info(String.format(MSG_ROUTER, osRouter.getName(), MSG_CREATED));
+        log.info(String.format(MSG_ROUTER, deriveResourceName(osRouter), MSG_CREATED));
     }
 
     @Override
     public void updateRouter(Router osRouter) {
         checkNotNull(osRouter, ERR_NULL_ROUTER);
         checkArgument(!Strings.isNullOrEmpty(osRouter.getId()), ERR_NULL_ROUTER_ID);
-        checkArgument(!Strings.isNullOrEmpty(osRouter.getName()), ERR_NULL_ROUTER_NAME);
 
         osRouterStore.updateRouter(osRouter);
         log.info(String.format(MSG_ROUTER, osRouter.getId(), MSG_UPDATED));
@@ -136,7 +135,7 @@
             }
             Router osRouter = osRouterStore.removeRouter(routerId);
             if (osRouter != null) {
-                log.info(String.format(MSG_ROUTER, osRouter.getName(), MSG_REMOVED));
+                log.info(String.format(MSG_ROUTER, deriveResourceName(osRouter), MSG_REMOVED));
             }
         }
     }