commit f7d2a2606b58d5ba3928ea2941ee0dffca0ed5f3
author tony-liu <liutao61@huawei.com> Mon Oct 17 16:32:24 2016 +0800
committer Thomas Vachuska <tom@onlab.us> Wed Nov 30 18:49:12 2016 +0000
tree 7b702ce45e95b609a3d9c3c0cebd4f3bfe186dac
parent 8ea6a56ac423ddc6fc6fcbb6c5d775015a9e0193

ONOS-5304 MDSC TE Tunnel controller

Change-Id: I1edbf3a583966f1389eb167543ced7bd6c4c51b3

ONOS-5304 MDSC TE Tunnel controller

Change-Id: I1edbf3a583966f1389eb167543ced7bd6c4c51b3

apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/DefaultTeTunnel.java

diff --git a/apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/DefaultTeTunnel.java b/apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/DefaultTeTunnel.java
index 686731c..c5a5041 100755
--- a/apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/DefaultTeTunnel.java
+++ b/apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/DefaultTeTunnel.java
@@ -125,13 +125,13 @@
     }
 
     @Override
-    public TeTunnelKey e2eTunnel() {
+    public TeTunnelKey e2eTunnelKey() {
         return e2eTunnel;
     }
 
     @Override
-    public void e2eTunnel(TeTunnelKey e2eTunnel) {
-        this.e2eTunnel = e2eTunnel;
+    public void e2eTunnelKey(TeTunnelKey e2eTunnelKey) {
+        this.e2eTunnel = e2eTunnelKey;
     }
 
     @Override

apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/TeTunnel.java

diff --git a/apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/TeTunnel.java b/apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/TeTunnel.java
index 0c1bd2f..9afd0d0 100755
--- a/apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/TeTunnel.java
+++ b/apps/tetunnel/api/src/main/java/org/onosproject/tetunnel/api/tunnel/TeTunnel.java
@@ -182,14 +182,14 @@
      *
      * @return key of the corresponding E2E TE tunnel
      */
-    TeTunnelKey e2eTunnel();
+    TeTunnelKey e2eTunnelKey();
 
     /**
      * Sets the E2E tunnel of this (segment) tunnel.
      *
-     * @param e2eTunnel key of the corresponding E2E tunnel
+     * @param e2eTunnelKey key of the corresponding E2E tunnel
      */
-    void e2eTunnel(TeTunnelKey e2eTunnel);
+    void e2eTunnelKey(TeTunnelKey e2eTunnelKey);
 
     //TODO: add more required TE attributes
 }

apps/tetunnel/app/src/main/java/org/onosproject/tetunnel/impl/TeTunnelManager.java

diff --git a/apps/tetunnel/app/src/main/java/org/onosproject/tetunnel/impl/TeTunnelManager.java b/apps/tetunnel/app/src/main/java/org/onosproject/tetunnel/impl/TeTunnelManager.java
index 04cbefc..82ce04f 100755
--- a/apps/tetunnel/app/src/main/java/org/onosproject/tetunnel/impl/TeTunnelManager.java
+++ b/apps/tetunnel/app/src/main/java/org/onosproject/tetunnel/impl/TeTunnelManager.java
@@ -168,7 +168,7 @@
                                  List<TeTunnelKey> segmentTunnels) {
         TeTunnel e2eTunnel = store.getTeTunnel(e2eTunnelKey);
         if (e2eTunnel == null) {
-            log.error("unknown e2eTunnel: {}", e2eTunnelKey);
+            log.error("unknown e2eTunnelKey: {}", e2eTunnelKey);
             return;
         }
         e2eTunnel.segmentTunnels(segmentTunnels);
@@ -179,7 +179,7 @@
                 log.warn("unknown segmentTunnel: {}", key);
                 continue;
             }
-            segmentTunnel.e2eTunnel(e2eTunnelKey);
+            segmentTunnel.e2eTunnelKey(e2eTunnelKey);
         }
     }
 
@@ -221,7 +221,7 @@
 
     @Override
     public void teTunnelRemoved(TeTunnel teTunnel) {
-        TeTunnelKey e2eTunnelKey = teTunnel.e2eTunnel();
+        TeTunnelKey e2eTunnelKey = teTunnel.e2eTunnelKey();
         store.removeTeTunnel(teTunnel.teTunnelKey());
 
         // it's a segment tunnel