From 9cbf478e036cebb38b68ab84a8795c86eee35dca Mon Sep 17 00:00:00 2001 From: Suraj Ranjan Date: Tue, 2 Aug 2016 13:55:44 +0530 Subject: [PATCH] Global use of table ids from NwConstants.java This review includes following things: 1> After merging of https://git.opendaylight.org/gerrit/#/c/42940/, build of Netvirt started failing. Because ElanStatisticsImpl.java was using one constant from IfmConstants.java, which was removed in mentioned commit. 2> Removed few table ids from FibConstants.java, NATConstants.java and VpnSubnetRouteHandler.java then using directly from NwConstants.java. Change-Id: Ie6d1663113d7f8dcb1965954d51776d98fd73ddb Signed-off-by: Suraj Ranjan --- .../netvirt/elan/statisitcs/ElanStatisticsImpl.java | 2 +- .../org/opendaylight/netvirt/fibmanager/FibConstants.java | 3 --- .../org/opendaylight/netvirt/fibmanager/FibManager.java | 4 ++-- .../netvirt/fibmanager/FibRpcServiceImpl.java | 8 ++++---- .../natservice/internal/ExternalRoutersListener.java | 2 +- .../netvirt/natservice/internal/NatConstants.java | 1 - .../netvirt/natservice/internal/VpnFloatingIpHandler.java | 5 ++--- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java index 8ad86f1e0d..cfc6d5461f 100755 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java @@ -111,7 +111,7 @@ public class ElanStatisticsImpl implements ElanStatisticsService { BigInteger dpId = interfaceInfo.getDpId(); List matches = null; String interfaceName = interfaceInfo.getInterfaceName(); - if (tableId == IfmConstants.VLAN_INTERFACE_INGRESS_TABLE) { + if (tableId == NwConstants.VLAN_INTERFACE_INGRESS_TABLE) { VlanInterfaceInfo vlanInterfaceInfo = (VlanInterfaceInfo)interfaceInfo; matches = InterfaceServiceUtil.getMatchInfoForVlanLPort(dpId, interfaceInfo.getPortNo(), InterfaceServiceUtil.getVlanId(interfaceName, elanServiceProvider.getBroker()), vlanInterfaceInfo.isVlanTransparent()); diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java index 5d837d98b9..4b69d97daf 100644 --- a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java +++ b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java @@ -10,12 +10,9 @@ package org.opendaylight.netvirt.fibmanager; import java.math.BigInteger; public class FibConstants { - static final BigInteger COOKIE_VM_LFIB_TABLE = new BigInteger("8000002", 16); - static final BigInteger COOKIE_VM_FIB_TABLE = new BigInteger("8000003", 16); static final BigInteger COOKIE_TUNNEL = new BigInteger("9000000", 16); static final int DEFAULT_FIB_FLOW_PRIORITY = 10; static final String FLOWID_PREFIX = "L3."; static final String VPN_IDPOOL_NAME = "vpnservices"; static final String SEPARATOR = "."; - public static final short L3VPN_SERVICE_IDENTIFIER = 2; // TODO : This should be in just on place } diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManager.java b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManager.java index 7f5f5b2166..e1299d9f90 100644 --- a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManager.java +++ b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManager.java @@ -609,7 +609,7 @@ public class FibManager extends AbstractDataChangeListener implements List actionsInfos = Arrays.asList(new ActionInfo(ActionType.pop_mpls, new String[]{})); BigInteger[] metadata = new BigInteger[] { - MetaDataUtil.getMetaDataForLPortDispatcher(lportTag, FibConstants.L3VPN_SERVICE_IDENTIFIER), + MetaDataUtil.getMetaDataForLPortDispatcher(lportTag, NwConstants.L3VPN_SERVICE_INDEX), MetaDataUtil.getMetaDataMaskForLPortDispatcher() }; List instructions = @@ -667,7 +667,7 @@ public class FibManager extends AbstractDataChangeListener implements BigInteger[] metadata = new BigInteger[] { MetaDataUtil.getMetaDataForLPortDispatcher(otherEndpointlportTag, - FibConstants.L3VPN_SERVICE_IDENTIFIER), + NwConstants.L3VPN_SERVICE_INDEX), MetaDataUtil.getMetaDataMaskForLPortDispatcher() }; List instructions = diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java index f2542ec2d9..bc05d762d2 100644 --- a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java +++ b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java @@ -162,7 +162,7 @@ public class FibRpcServiceImpl implements FibRpcService { int priority = DEFAULT_FIB_FLOW_PRIORITY + prefixLength; Flow flowEntity = MDSALUtil.buildFlowNew(NwConstants.L3_FIB_TABLE, flowRef, priority, flowRef, 0, 0, - COOKIE_VM_FIB_TABLE, matches, null); + NwConstants.COOKIE_VM_FIB_TABLE, matches, null); mdsalManager.removeFlow(dpnId, flowEntity); @@ -181,7 +181,7 @@ public class FibRpcServiceImpl implements FibRpcService { Flow flowEntity = MDSALUtil.buildFlowNew(NwConstants.L3_LFIB_TABLE, flowRef, DEFAULT_FIB_FLOW_PRIORITY, flowRef, 0, 0, - COOKIE_VM_LFIB_TABLE, matches, null); + NwConstants.COOKIE_VM_LFIB_TABLE, matches, null); mdsalManager.removeFlow(dpnId, flowEntity); @@ -251,7 +251,7 @@ public class FibRpcServiceImpl implements FibRpcService { int priority = DEFAULT_FIB_FLOW_PRIORITY + prefixLength; Flow flowEntity = MDSALUtil.buildFlowNew(NwConstants.L3_FIB_TABLE, flowRef, priority, flowRef, 0, 0, - COOKIE_VM_FIB_TABLE, matches, customInstructions); + NwConstants.COOKIE_VM_FIB_TABLE, matches, customInstructions); mdsalManager.installFlow(dpnId, flowEntity); @@ -276,7 +276,7 @@ public class FibRpcServiceImpl implements FibRpcService { Flow flowEntity = MDSALUtil.buildFlowNew(NwConstants.L3_LFIB_TABLE, flowRef, DEFAULT_FIB_FLOW_PRIORITY, flowRef, 0, 0, - COOKIE_VM_LFIB_TABLE, matches, instructions); + NwConstants.COOKIE_VM_LFIB_TABLE, matches, instructions); mdsalManager.installFlow(dpId, flowEntity); diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java index d8e4235ae3..52a94a79a9 100644 --- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java +++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java @@ -564,7 +564,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase