From 2b5fefbf817c8ae463b5f3fa65fb14bf8f52e7c8 Mon Sep 17 00:00:00 2001
From: Andrea Campanella <andrea@opennetworking.org>
Date: Thu, 22 Aug 2019 16:29:21 +0200
Subject: [PATCH] Update of discovery for TAPI OLS based on ADVA testing

Change-Id: I1037fa877c88164a805d15f265fd918ec9c1d33d
---
 .../org/onosproject/drivers/odtn/tapi/TapiDeviceHelper.java  | 1 +
 .../onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java | 5 ++++-
 drivers/odtn-driver/src/main/resources/odtn-drivers.xml      | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceHelper.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceHelper.java
index dee318cb7a..efbc12d032 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceHelper.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceHelper.java
@@ -38,6 +38,7 @@ public final class TapiDeviceHelper {
     private static final Logger log = getLogger(TapiDeviceHelper.class);
 
     public static final String SERVICE_INTERFACE_POINT = "service-interface-point";
+    public static final String TAPI_COMMON = "tapi-common";
     public static final String CONTEXT = "tapi-common:context";
     public static final String UUID = "uuid";
     public static final String MEDIA_CHANNEL_SERVICE_INTERFACE_POINT_SPEC =
diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
index 5f0f52e213..7076583cd1 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
@@ -39,6 +39,8 @@ import java.util.Set;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.MC_POOL;
 import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.MEDIA_CHANNEL_SERVICE_INTERFACE_POINT_SPEC;
+import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.SERVICE_INTERFACE_POINT;
+import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.TAPI_COMMON;
 import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.UUID;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -84,7 +86,8 @@ public class TapiDeviceLambdaQuery extends AbstractHandlerBehaviour
                     MediaType.APPLICATION_JSON_TYPE);
             log.debug("Service interface point UUID: {}", uuid);
             JsonNode sipAttributes = new ObjectMapper().readTree(inputStream);
-            JsonNode mcPool = sipAttributes.get(MEDIA_CHANNEL_SERVICE_INTERFACE_POINT_SPEC).get(MC_POOL);
+            JsonNode mcPool = sipAttributes.get(TAPI_COMMON + ":" + SERVICE_INTERFACE_POINT).get(0)
+                    .get(MEDIA_CHANNEL_SERVICE_INTERFACE_POINT_SPEC).get(MC_POOL);
 
             //This creates a hashset of OChSignals representing the spectrum availability at the target port.
             return TapiDeviceHelper.getOchSignal(mcPool);
diff --git a/drivers/odtn-driver/src/main/resources/odtn-drivers.xml b/drivers/odtn-driver/src/main/resources/odtn-drivers.xml
index c4f2faa035..4586a7530f 100644
--- a/drivers/odtn-driver/src/main/resources/odtn-drivers.xml
+++ b/drivers/odtn-driver/src/main/resources/odtn-drivers.xml
@@ -16,6 +16,8 @@
   -->
 <drivers>
     <driver name="ols" manufacturer="tapi-swagger" hwVersion="0" swVersion="2.1">
+        <behaviour api ="org.onosproject.net.optical.OpticalDevice"
+                   impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
         <behaviour api="org.onosproject.net.device.DeviceDescriptionDiscovery"
                    impl="org.onosproject.drivers.odtn.tapi.TapiDeviceDescriptionDiscovery"/>
         <behaviour api ="org.onosproject.net.behaviour.LambdaQuery"