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/OpenstackRoutingHandler.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
index d7fa91b..b825fc6 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
@@ -79,6 +79,7 @@
 import static org.onosproject.openstacknetworking.api.Constants.STAT_OUTBOUND_TABLE;
 import static org.onosproject.openstacknetworking.impl.OsgiPropertyConstants.ARP_MODE;
 import static org.onosproject.openstacknetworking.impl.OsgiPropertyConstants.USE_STATEFUL_SNAT;
+import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.deriveResourceName;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.getPropertyValue;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.getPropertyValueAsBoolean;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.tunnelPortNumByNetType;
@@ -200,7 +201,7 @@
 
         setInternalRoutes(osRouter, osSubnet, true);
         setGatewayRules(osSubnet, osRouter, true);
-        log.info("Connected subnet({}) to {}", osSubnet.getCidr(), osRouter.getName());
+        log.info("Connected subnet({}) to {}", osSubnet.getCidr(), deriveResourceName(osRouter));
     }
 
     private void routerIfaceRemoved(Router osRouter, RouterInterface osRouterIface) {
@@ -221,7 +222,7 @@
 
         setInternalRoutes(osRouter, osSubnet, false);
         setGatewayRules(osSubnet, osRouter, false);
-        log.info("Disconnected subnet({}) from {}", osSubnet.getCidr(), osRouter.getName());
+        log.info("Disconnected subnet({}) from {}", osSubnet.getCidr(), deriveResourceName(osRouter));
     }
 
     private void setGatewayRules(Subnet osSubnet, Router osRouter, boolean install) {
@@ -658,8 +659,7 @@
             }
 
             log.debug("Router(name:{}, ID:{}) is created",
-                                                    event.subject().getName(),
-                                                    event.subject().getId());
+                    deriveResourceName(event.subject()), event.subject().getId());
 
             routerUpdated(event.subject());
         }
@@ -670,8 +670,7 @@
             }
 
             log.debug("Router(name:{}, ID:{}) is updated",
-                                                    event.subject().getName(),
-                                                    event.subject().getId());
+                    deriveResourceName(event.subject()), event.subject().getId());
 
             routerUpdated(event.subject());
         }
@@ -682,8 +681,7 @@
             }
 
             log.debug("Router(name:{}, ID:{}) is removed",
-                                                    event.subject().getName(),
-                                                    event.subject().getId());
+                    deriveResourceName(event.subject()), event.subject().getId());
 
             routerRemove(event.subject());
         }