commit 34a3f69be11cc09c3ac0cb629d966fbc515fb186
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Sat Jan 09 21:08:57 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon May 09 22:24:41 2016 +0000
tree cc83967766df54c2371581a677e551070b5c92cd
parent 9ce9e259a8ffb42ff1d3e2798384ab25b341eee2

ONOS-3503 Remove OchPort out of core.

- Implementation of a Behavior OpticalDevice has the knowledge of
  translating annotations into optical specific port.
- OpticalDeviceServiceView checks if the Device is a OpticalDevice
  and translate all the Ports to optical specific port before returning.

- This commit contains feedbacks, issues, and fixes by Michele Santuari.

- Note: 3 more Port types to go (OduClt, Oms, Otu)

Change-Id: I4cbda8bc1922fbdd4dac8de8d02294bad74b8058

web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java

diff --git a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
index 5ecf225..46e546f 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
@@ -38,7 +38,6 @@
 import org.onosproject.net.HostLocation;
 import org.onosproject.net.Link;
 import org.onosproject.net.MastershipRole;
-import org.onosproject.net.OchPort;
 import org.onosproject.net.OchSignal;
 import org.onosproject.net.OduCltPort;
 import org.onosproject.net.OduSignalType;
@@ -55,7 +54,6 @@
 import org.onosproject.net.device.DeviceProviderRegistry;
 import org.onosproject.net.device.DeviceProviderService;
 import org.onosproject.net.device.DeviceService;
-import org.onosproject.net.device.OchPortDescription;
 import org.onosproject.net.device.OduCltPortDescription;
 import org.onosproject.net.device.OmsPortDescription;
 import org.onosproject.net.device.PortDescription;
@@ -67,6 +65,7 @@
 import org.onosproject.net.link.LinkProvider;
 import org.onosproject.net.link.LinkProviderRegistry;
 import org.onosproject.net.link.LinkProviderService;
+import org.onosproject.net.optical.OchPort;
 import org.onosproject.net.provider.ProviderId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -88,6 +87,8 @@
 import static org.onosproject.net.PortNumber.portNumber;
 import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_ADDED;
 import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_AVAILABILITY_CHANGED;
+import static org.onosproject.net.optical.device.OchPortHelper.ochPortDescription;
+import static org.onosproject.net.optical.device.OpticalDeviceServiceView.opticalView;
 
 /**
  * Provider of devices and links parsed from a JSON configuration structure.
@@ -139,7 +140,7 @@
                    LinkProviderRegistry linkProviderRegistry,
                    HostProviderRegistry hostProviderRegistry) {
         this.cfg = checkNotNull(cfg, "Configuration cannot be null");
-        this.deviceService = checkNotNull(deviceService, "Device service cannot be null");
+        this.deviceService = opticalView(checkNotNull(deviceService, "Device service cannot be null"));
         this.deviceProviderRegistry = checkNotNull(deviceProviderRegistry, "Device provider registry cannot be null");
         this.linkProviderRegistry = checkNotNull(linkProviderRegistry, "Link provider registry cannot be null");
         this.hostProviderRegistry = checkNotNull(hostProviderRegistry, "Host provider registry cannot be null");
@@ -269,7 +270,7 @@
             case OCH:
                 annotations = annotations(node.get("annotations"));
                 OchPort ochPort = (OchPort) deviceService.getPort(deviceId, port);
-                return new OchPortDescription(port, node.path("enabled").asBoolean(true),
+                return ochPortDescription(port, node.path("enabled").asBoolean(true),
                         ochPort.signalType(), ochPort.isTunable(),
                         ochPort.lambda(), annotations);
             case OMS:
@@ -363,13 +364,13 @@
         }
         OchSignal signal = new OchSignal(GridType.DWDM, chsp, 1, 1);
         if (src.type() == Device.Type.ROADM) {
-            PortDescription portDesc = new OchPortDescription(srcCp.port(), true,
+            PortDescription portDesc = ochPortDescription(srcCp.port(), true,
                     OduSignalType.ODU4, true, signal);
             descriptions.put(srcCp, portDesc);
             deviceProviderService.portStatusChanged(srcCp.deviceId(), portDesc);
         }
         if (dst.type() == Device.Type.ROADM) {
-            PortDescription portDesc = new OchPortDescription(dstCp.port(), true,
+            PortDescription portDesc = ochPortDescription(dstCp.port(), true,
                     OduSignalType.ODU4, true, signal);
             descriptions.put(dstCp, portDesc);
             deviceProviderService.portStatusChanged(dstCp.deviceId(), portDesc);
@@ -482,7 +483,7 @@
                         op.number(), op.isEnabled(), op.minFrequency(), op.maxFrequency(), op.grid());
             case OCH:
                 OchPort ochp = (OchPort) p;
-                return new OchPortDescription(
+                return ochPortDescription(
                         ochp.number(), ochp.isEnabled(), ochp.signalType(), ochp.isTunable(), ochp.lambda());
             case ODUCLT:
                 OduCltPort odup = (OduCltPort) p;