commit e4b2c681011ac26bb59eee4dff57aa28926e8342
author Andrea Campanella <andrea@opennetworking.org> Fri Aug 23 15:42:55 2019 +0200
committer Andrea Campanella <andrea@opennetworking.org> Wed Aug 28 22:57:26 2019 +0000
tree 8e8b7e61f56403aabd9553e0169455cfbcd30d27
parent 1edc0bd3fdc82d26da619c8ba6cb4c90d57d87f0

Optical Intent compiler fix and ADVA OLS testing derived adjustments

Change-Id: I986431b751e3ba060cf81f357938b34f3a68f5aa

drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceDescriptionDiscovery.java

diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceDescriptionDiscovery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceDescriptionDiscovery.java
index 2c35a29..71e338e 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceDescriptionDiscovery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceDescriptionDiscovery.java
@@ -54,6 +54,7 @@
 import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.SUPPORTED_LAYER_PROTOCOL_QUALIFIER;
 import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.UUID;
 import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.getOchSignal;
+import static org.onosproject.drivers.odtn.tapi.TapiDeviceHelper.removeInitalConnectivityServices;
 import static org.onosproject.net.optical.device.OchPortHelper.ochPortDescription;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -119,9 +120,13 @@
                 log.error("Can't discover port details at {}", SIP_REQUEST_DATA_API);
                 return ImmutableList.of();
             }
-            return parseTapiPorts(jsonNode);
+            List<PortDescription> ports = parseTapiPorts(jsonNode);
+            //Removing any initial connectivity services
+            removeInitalConnectivityServices(deviceId, handler());
+            return ports;
         } catch (IOException e) {
             log.error("Exception discoverPortDetails() {}", did(), e);
+            removeInitalConnectivityServices(deviceId, handler());
             return ImmutableList.of();
         }
     }