commit ab98a1fbc54d8914048b4b4f319898400057d84e
author Jian Li <pyguni@gmail.com> Fri Oct 04 13:52:12 2019 +0900
committer Jian Li <pyguni@gmail.com> Fri Oct 04 14:47:52 2019 +0900
tree 6ed73e65f46642c1a05bd41d0ddc8c43c739c052
parent 40f032a9f9a92aaa850d7e0b40db35c162698f64

Fix: resolve a NPE when removing VLAN typed openstack network

Change-Id: I55c4f215211a2ecc5353ea9033dca41cbbd81edf

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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
index c3e0329..68fe4df 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
@@ -481,7 +481,7 @@
                 .matchEthType(EthType.EtherType.ARP.ethType().toShort())
                 .matchArpOp(ARP.OP_REQUEST)
                 .matchArpTpa(port.ipAddress().getIp4Address())
-                .matchTunnelId(Long.valueOf(segId))
+                .matchTunnelId(Long.parseLong(segId))
                 .build();
 
         setRemoteArpTreatmentForTunnel(selector, port, localNode, install);
@@ -954,7 +954,7 @@
 
             if (netType != NetworkType.LOCAL && netType != NetworkType.FLAT
                     && netType != NetworkType.VLAN) {
-                String segId = osNetworkService.segmentId(netId);
+                String segId = network.getProviderSegID();
                 osNodeService.completeNodes(COMPUTE)
                         .forEach(node -> {
                             setBaseVnetArpRuleForBroadcastMode(node, segId,
@@ -962,7 +962,7 @@
                         });
             }
             if (netType == NetworkType.VLAN) {
-                String segId = osNetworkService.segmentId(netId);
+                String segId = network.getProviderSegID();
                 osNodeService.completeNodes(COMPUTE)
                         .forEach(node -> {
                             setBaseVnetArpRuleForBroadcastMode(