Cleanup unused constants in cloud-servicechain-impl

 + Constants referring to Service indexes and table numbers are
   centrally located in NwConstants, they shouldnt be here

Change-Id: I3250a8d1976c0b9e18b27960818525dcfb50f35f
Signed-off-by: Miguel Perez <francisco.miguel.perez@ericsson.com>

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java
index 4773829bbaaa87f8489e932fee0d23768bcbb08d..101ec8485b682721fa8d31584d5c5e1fd9c80efa 100644 (file)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java
@@ -21,14 +21,6 @@ public class CloudServiceChainConstants {
     public static final String FLOWID_PREFIX_SCF = "SCF.";
     public static final String FLOWID_PREFIX_L3 = "L3.";
 
-    public static final short SCF_SERVICE_INDEX = 1;
-    public static final short ELAN_SERVICE_INDEX = 3;
-    public static final short LPORT_DISPATCHER_TABLE = 17;
-    public static final short ELAN_SMAC_TABLE = 50;
-    public static final short FIB_TABLE = 21;
-    public static final short SCF_UP_SUB_FILTER_TCP_BASED_TABLE = 70;
-    public static final short SCF_DOWN_SUB_FILTER_TCP_BASED_TABLE = 72;
-    public static final short SCF_CHAIN_FWD_TABLE = 75;
     public static final String FLOWID_PREFIX = "L3.";
     public static final String L2_FLOWID_PREFIX = "L2.";
     public static final String VPN_PSEUDO_PORT_FLOWID_PREFIX = "VpnPseudoPort.";

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java
index 148e67512203dd6e9b3fffd521f449dffd8d915e..7dedc6ea4ae30020135d01080273a0b51980a046 100755 (executable)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java
@@ -151,8 +151,8 @@ public class ElanServiceChainHandler {
 
             for (BigInteger dpnId : operativeDPNs) {
                 ElanServiceChainUtils.programLPortDispatcherToScf(mdsalManager, dpnId, elanTag, elanLportTag,
-                        CloudServiceChainConstants.SCF_DOWN_SUB_FILTER_TCP_BASED_TABLE,
-                        scfTag, NwConstants.DEL_FLOW);
+                                                                  NwConstants.SCF_DOWN_SUB_FILTER_TCP_BASED_TABLE,
+                                                                  scfTag, NwConstants.DEL_FLOW);
                 ElanServiceChainUtils.programLPortDispatcherFromScf(mdsalManager, dpnId, elanLportTag, elanTag,
                                                                     NwConstants.DEL_FLOW);
                 ElanServiceChainUtils.programExternalTunnelTable(mdsalManager, dpnId, elanLportTag, vni, elanTag,