commit 1c24fb9689f27f33beb8c081b7a5b20d77465b62
author Andrea Campanella <andrea@opennetworking.org> Thu Dec 20 16:43:59 2018 +0100
committer Andrea Campanella <andrea@opennetworking.org> Thu Jan 10 08:44:26 2019 +0000
tree a2eabfc8a996a6092176aed349ac0085b75314bb
parent 9148182d15aff555f09b511bec21123ffdb9eb97

[ONOS-7885] Adding Terminal_device device Type

Change-Id: I42a8f8aeef73e1d51d4b5128b9eb7e8879d0418c

drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/CassiniTerminalDeviceDiscovery.java

diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/CassiniTerminalDeviceDiscovery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/CassiniTerminalDeviceDiscovery.java
index ca7fbc2..acb6c4a 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/CassiniTerminalDeviceDiscovery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/CassiniTerminalDeviceDiscovery.java
@@ -140,7 +140,7 @@
     @Override
     public DeviceDescription discoverDeviceDetails() {
         return new DefaultDeviceDescription(handler().data().deviceId().uri(),
-                                            Device.Type.OTN,
+                                            Device.Type.TERMINAL_DEVICE,
                                             "EDGECORE",
                                             "Cassini",
                                             "OcNOS",

drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java

diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java
index 55eb6c7..e137b92 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java
@@ -64,7 +64,7 @@
     @Override
     public DeviceDescription discoverDeviceDetails() {
         return new DefaultDeviceDescription(handler().data().deviceId().uri(),
-                Device.Type.OTN, "Infinera", "XT-3300",
+                Device.Type.TERMINAL_DEVICE, "Infinera", "XT-3300",
                 "unknown", "unknown", new ChassisId());
     }
 

drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/OpenConfigDeviceDiscovery.java

diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/OpenConfigDeviceDiscovery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/OpenConfigDeviceDiscovery.java
index fa5b14e..086c5ab 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/OpenConfigDeviceDiscovery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/OpenConfigDeviceDiscovery.java
@@ -64,7 +64,7 @@
     @Override
     public DeviceDescription discoverDeviceDetails() {
         return new DefaultDeviceDescription(handler().data().deviceId().uri(),
-                Device.Type.OTN, "unknown", "unknown",
+                Device.Type.TERMINAL_DEVICE, "unknown", "unknown",
                 "unknown", "unknown", new ChassisId());
     }
 

drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/openconfig/TerminalDeviceDiscovery.java

diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/openconfig/TerminalDeviceDiscovery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/openconfig/TerminalDeviceDiscovery.java
index b65f15c..36926e8 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/openconfig/TerminalDeviceDiscovery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/openconfig/TerminalDeviceDiscovery.java
@@ -257,7 +257,7 @@
 
         // Other option "OTHER", we use ROADM for now
         org.onosproject.net.Device.Type type =
-            org.onosproject.net.Device.Type.ROADM;
+            Device.Type.TERMINAL_DEVICE;
 
         // Some defaults
         String vendor       = "NOVENDOR";