| commit | fa0f6cc7003b4a40369c7dacbef7beaff610c0a5 | [log] [tgz] |
|---|---|---|
| author | Andrea Campanella <andrea@opennetworking.org> | Tue Dec 18 15:17:53 2018 +0100 |
| committer | Thomas Vachuska <tom@opennetworking.org> | Wed Dec 19 16:26:38 2018 +0000 |
| tree | 74d962503f5c58478b7d191e70f978dcb6f4eb8f | |
| parent | 8b17e0eec5332f6db915af95ee8ff271848642b7 [diff] |
Adding OLS device Type for ODTN project Change-Id: Ia3472b47ea12d2f2f44de9cb88f20774881530ee
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java index 59ee3d9..f39b01a 100644 --- a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java +++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
@@ -566,7 +566,8 @@ * @return true if in packet layer, false otherwise */ private boolean isTransportLayer(Device.Type type) { - return type == Device.Type.ROADM || type == Device.Type.OTN || type == Device.Type.ROADM_OTN; + return type == Device.Type.ROADM || type == Device.Type.OTN || type == Device.Type.ROADM_OTN || + type == Device.Type.OLS; } /**
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/util/OpticalIntentUtility.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/util/OpticalIntentUtility.java index 004c302..758db56 100644 --- a/apps/optical-model/src/main/java/org/onosproject/net/optical/util/OpticalIntentUtility.java +++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/util/OpticalIntentUtility.java
@@ -91,7 +91,8 @@ CltSignalType signalType = ((OduCltPort) srcPort).signalType(); if (Device.Type.ROADM.equals(srcDevice.type()) || - Device.Type.ROADM_OTN.equals(srcDevice.type())) { + Device.Type.ROADM_OTN.equals(srcDevice.type()) || + Device.Type.OLS.equals(srcDevice.type())) { intent = OpticalCircuitIntent.builder() .appId(appId) .key(key) @@ -173,7 +174,8 @@ CltSignalType signalType = ((OduCltPort) srcPort).signalType(); if (Device.Type.ROADM.equals(srcDevice.type()) || - Device.Type.ROADM_OTN.equals(srcDevice.type())) { + Device.Type.ROADM_OTN.equals(srcDevice.type()) || + Device.Type.OLS.equals(srcDevice.type())) { intent = OpticalCircuitIntent.builder() .appId(appId) .key(key)