1. move tunnel 3 commands to onos-cli
2. add OCH ODU OMS port type;
3. fix some bugs in pcep tunnel provider and topology provider
4. Optimization of the command line tools of tunnel

Change-Id: I323ede971795c8fe6ecddc40e1061f42a8243867

fix tunnel provider bugs.

Change-Id: I323ede971795c8fe6ecddc40e1061f42a8243867
diff --git a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepLink.java b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepLink.java
index d4db519..9d9e60a 100644
--- a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepLink.java
+++ b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepLink.java
@@ -48,13 +48,16 @@
     }
 
 
+    public enum PortType {
+        ODU_PORT, OCH_PORT, OMS_PORT
+    }
 
     /**
      * Get the link endpoint port type.
      *
      * @return endpoint port type
      */
-    public String portType();
+    public PortType portType();
 
     /**
      * Get the link sub type,OTS,OPS,PKT_OPTICAL or ODUK.
diff --git a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepSwitch.java b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepSwitch.java
index e6c994e..ded1a79 100644
--- a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepSwitch.java
+++ b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepSwitch.java
@@ -20,7 +20,7 @@
  */
 public interface PcepSwitch extends PcepOperator {
 
-    public static enum SubDeviceType {
+    public static enum DeviceType {
         /* optical device */
         ROADM,
 
@@ -52,7 +52,7 @@
      * Gets the sub type of the device.
      * @return the sub type
      */
-    public SubDeviceType getDeviceSubType();
+    public DeviceType getDeviceType();
 
     /**
      * fetch the manufacturer description.