Fix: resolve a NPE when removing VLAN typed openstack network

Change-Id: I55c4f215211a2ecc5353ea9033dca41cbbd81edf

Author: gunine

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

@@ -481,7 +481,7 @@ private void setRemoteArpRequestRuleForTunnel(InstancePort port, boolean install
                 .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,15 +954,15 @@ private void setVnetArpRule(Network network, boolean install) {
 
             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,
                                     netId, true, install);
                         });
             }
             if (netType == NetworkType.VLAN) {
-                String segId = osNetworkService.segmentId(netId);
+                String segId = network.getProviderSegID();
                 osNodeService.completeNodes(COMPUTE)
                         .forEach(node -> {
                             setBaseVnetArpRuleForBroadcastMode(