commit fb417949c215ac074df1c08b5deaea1a961f81c8
author Hyunsun Moon <hyunsun.moon@gmail.com> Thu Jun 23 14:48:20 2016 -0700
committer Jonathan Hart <jono@onlab.us> Thu Jun 23 14:53:33 2016 -0700
tree 0dab3f8843deda6f0cb526f0e6152f6918e3b8a8
parent 32356ec2efadd860a58fe38460076573af2e1529

Revert "[WIP] CORD-129 Support access agent in VTN"

This reverts commit 3a7bf9ef863e2c19d7d08f284003de130e8cd0cf.

Change-Id: Iad39407e7a48fc5a079501232678dea378491820

src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java

diff --git a/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
index 0bea32e..4e01d2b 100644
--- a/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
@@ -79,9 +79,9 @@
     // tables
     public static final int TABLE_ZERO = 0;
     public static final int TABLE_IN_PORT = 1;
-    public static final int TABLE_ACCESS = 2;
+    public static final int TABLE_ACCESS_TYPE = 2;
     public static final int TABLE_IN_SERVICE = 3;
-    public static final int TABLE_DST = 4;
+    public static final int TABLE_DST_IP = 4;
     public static final int TABLE_TUNNEL_IN = 5;
     public static final int TABLE_VLAN = 6;
 
@@ -320,7 +320,7 @@
                 .build();
 
         treatment = DefaultTrafficTreatment.builder()
-                .transition(CordVtnPipeline.TABLE_DST)
+                .transition(CordVtnPipeline.TABLE_DST_IP)
                 .build();
 
         flowRule = DefaultFlowRule.builder()
@@ -406,7 +406,7 @@
                 .build();
 
         treatment = DefaultTrafficTreatment.builder()
-                .transition(TABLE_DST)
+                .transition(TABLE_DST_IP)
                 .build();
 
         flowRule = DefaultFlowRule.builder()
@@ -427,7 +427,7 @@
                     .build();
 
             treatment = DefaultTrafficTreatment.builder()
-                    .transition(TABLE_DST)
+                    .transition(TABLE_DST_IP)
                     .build();
 
             flowRule = DefaultFlowRule.builder()
@@ -458,7 +458,7 @@
                 .withTreatment(treatment)
                 .withPriority(PRIORITY_ZERO)
                 .forDevice(deviceId)
-                .forTable(TABLE_ACCESS)
+                .forTable(TABLE_ACCESS_TYPE)
                 .makePermanent()
                 .build();