commit 337c5526d17dff0a1dc5114b015414afc9c221d2
author hiroki <hiroki.okui@gmail.com> Sun Jan 20 20:05:51 2019 -0800
committer Andrea Campanella <andrea@opennetworking.org> Fri Jan 25 08:26:53 2019 +0000
tree 7bd93b47cef7c688aa3d007d3f1355ae48620b39
parent fd515157d2fbaebab20d45e624afe162151c8916

ONOS-7867 FlowRuleProgrammable driver for OpenConfig Cassini

* Minor update of Transceiver and DescriptionDiscovery to support newly added Optical-Channel component
* Add OpenConfig config/state sample which can be used for initial value of emulator

Change-Id: I9497ec55965be6f3cc0f5b4b6270c77ebe50b4a8

apps/odtn/api/src/main/java/org/onosproject/odtn/behaviour/CassiniTransceiver.java

diff --git a/apps/odtn/api/src/main/java/org/onosproject/odtn/behaviour/CassiniTransceiver.java b/apps/odtn/api/src/main/java/org/onosproject/odtn/behaviour/CassiniTransceiver.java
index 0a23450..8f89807 100755
--- a/apps/odtn/api/src/main/java/org/onosproject/odtn/behaviour/CassiniTransceiver.java
+++ b/apps/odtn/api/src/main/java/org/onosproject/odtn/behaviour/CassiniTransceiver.java
@@ -36,7 +36,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.onosproject.odtn.behaviour.OdtnDeviceDescriptionDiscovery.OC_NAME;
+import static org.onosproject.odtn.behaviour.OdtnDeviceDescriptionDiscovery.OC_LOGICAL_CHANNEL;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -52,16 +52,15 @@
     @Override
     public List<CharSequence> enable(PortNumber client, PortNumber line, boolean enable) {
 
-        log.debug("enable() cassini route");
         DeviceId did = this.data().deviceId();
         Port clientPort = handler().get(DeviceService.class).getPort(did, client);
         if (clientPort == null) {
             log.warn("{} does not exist on {}", client, did);
             return Collections.emptyList();
         }
-        String clientName = clientPort.annotations().value(OC_NAME);
+        String clientName = clientPort.annotations().value(OC_LOGICAL_CHANNEL);
         if (Strings.isNullOrEmpty(clientName)) {
-            log.warn("{} annotations not exist on {}@{}", OC_NAME, client, did);
+            log.warn("{} annotations not exist on {}@{}", OC_LOGICAL_CHANNEL, client, did);
             return Collections.emptyList();
         }
 
@@ -70,9 +69,9 @@
             log.warn("{} does not exist on {}", line, did);
             return Collections.emptyList();
         }
-        String lineName = linePort.annotations().value(OC_NAME);
+        String lineName = linePort.annotations().value(OC_LOGICAL_CHANNEL);
         if (Strings.isNullOrEmpty(lineName)) {
-            log.warn("{} annotations not exist on {}@{}", OC_NAME, line, did);
+            log.warn("{} annotations not exist on {}@{}", OC_LOGICAL_CHANNEL, line, did);
             return Collections.emptyList();
         }