홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
HIGUCHI Yuta
Committed by Gerrit Code Review
deae31ec 1 parent b1548eef

[ONOS-4513] Move DefaultOpticalDevice to reduce package exported. 

Change-Id: I88db1508290e8d3722d46e85b947b4fdc9f4b66d
Inline Side-by-side
Showing 8 changed files with 10 additions and 23 deletions
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.optical.device; 16 +package org.onosproject.net.optical;
17 17
18 import static com.google.common.base.Preconditions.checkNotNull; 18 import static com.google.common.base.Preconditions.checkNotNull;
19 import static com.google.common.base.Preconditions.checkState; 19 import static com.google.common.base.Preconditions.checkState;
...@@ -27,11 +27,6 @@ import org.onosproject.net.Port; ...@@ -27,11 +27,6 @@ import org.onosproject.net.Port;
27 import org.onosproject.net.device.DeviceService; 27 import org.onosproject.net.device.DeviceService;
28 import org.onosproject.net.driver.AbstractBehaviour; 28 import org.onosproject.net.driver.AbstractBehaviour;
29 import org.onosproject.net.driver.DriverData; 29 import org.onosproject.net.driver.DriverData;
30 -import org.onosproject.net.optical.OchPort;
31 -import org.onosproject.net.optical.OduCltPort;
32 -import org.onosproject.net.optical.OmsPort;
33 -import org.onosproject.net.optical.OpticalDevice;
34 -import org.onosproject.net.optical.OtuPort;
35 import org.onosproject.net.optical.device.port.OchPortMapper; 30 import org.onosproject.net.optical.device.port.OchPortMapper;
36 import org.onosproject.net.optical.device.port.OduCltPortMapper; 31 import org.onosproject.net.optical.device.port.OduCltPortMapper;
37 import org.onosproject.net.optical.device.port.OmsPortMapper; 32 import org.onosproject.net.optical.device.port.OmsPortMapper;
...@@ -44,14 +39,15 @@ import com.google.common.annotations.Beta; ...@@ -44,14 +39,15 @@ import com.google.common.annotations.Beta;
44 import com.google.common.base.MoreObjects; 39 import com.google.common.base.MoreObjects;
45 import com.google.common.collect.ImmutableMap; 40 import com.google.common.collect.ImmutableMap;
46 41
47 -// FIXME This needs to be moved back to org.onosproject.net.optical.impl
48 -// after optical driver package separation process is complete.
49 /** 42 /**
50 * Implementation of {@link OpticalDevice}. 43 * Implementation of {@link OpticalDevice}.
51 * <p> 44 * <p>
52 * Currently supports 45 * Currently supports
53 * <ul> 46 * <ul>
54 * <li> {@link OchPort} 47 * <li> {@link OchPort}
48 + * <li> {@link OmsPort}
49 + * <li> {@link OduCltPort}
50 + * <li> {@link OtuPort}
55 * </ul> 51 * </ul>
56 */ 52 */
57 @Beta 53 @Beta
......
...@@ -19,7 +19,6 @@ package org.onosproject.drivers.ciena; ...@@ -19,7 +19,6 @@ package org.onosproject.drivers.ciena;
19 import org.apache.felix.scr.annotations.Component; 19 import org.apache.felix.scr.annotations.Component;
20 import org.onosproject.net.driver.AbstractDriverLoader; 20 import org.onosproject.net.driver.AbstractDriverLoader;
21 import org.onosproject.net.optical.OpticalDevice; 21 import org.onosproject.net.optical.OpticalDevice;
22 -import org.onosproject.net.optical.device.DefaultOpticalDevice;
23 22
24 /** 23 /**
25 * Loader for Ciena device drivers. 24 * Loader for Ciena device drivers.
...@@ -30,8 +29,6 @@ public class CienaDriversLoader extends AbstractDriverLoader { ...@@ -30,8 +29,6 @@ public class CienaDriversLoader extends AbstractDriverLoader {
30 // OSGI: help bundle plugin discover runtime package dependency. 29 // OSGI: help bundle plugin discover runtime package dependency.
31 @SuppressWarnings("unused") 30 @SuppressWarnings("unused")
32 private OpticalDevice optical; 31 private OpticalDevice optical;
33 - @SuppressWarnings("unused")
34 - private DefaultOpticalDevice driver;
35 32
36 public CienaDriversLoader() { 33 public CienaDriversLoader() {
37 super("/ciena-drivers.xml"); 34 super("/ciena-drivers.xml");
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <behaviour api="org.onosproject.net.behaviour.PortDiscovery" 19 <behaviour api="org.onosproject.net.behaviour.PortDiscovery"
20 impl="org.onosproject.drivers.ciena.PortDiscoveryCienaWaveserverImpl"/> 20 impl="org.onosproject.drivers.ciena.PortDiscoveryCienaWaveserverImpl"/>
21 <behaviour api="org.onosproject.net.optical.OpticalDevice" 21 <behaviour api="org.onosproject.net.optical.OpticalDevice"
22 - impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/> 22 + impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
23 </driver> 23 </driver>
24 </drivers> 24 </drivers>
25 25
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 <behaviour api="org.onosproject.net.behaviour.LambdaQuery" 62 <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
63 impl="org.onosproject.driver.query.LincOELambdaQuery"/> 63 impl="org.onosproject.driver.query.LincOELambdaQuery"/>
64 <behaviour api="org.onosproject.net.optical.OpticalDevice" 64 <behaviour api="org.onosproject.net.optical.OpticalDevice"
65 - impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/> 65 + impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
66 </driver> 66 </driver>
67 <driver name="ofdpa" extends="default" 67 <driver name="ofdpa" extends="default"
68 manufacturer="Broadcom Corp." hwVersion="OF-DPA.*" swVersion="OF-DPA.*"> 68 manufacturer="Broadcom Corp." hwVersion="OF-DPA.*" swVersion="OF-DPA.*">
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 <behaviour api="org.onosproject.net.behaviour.LambdaQuery" 168 <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
169 impl="org.onosproject.driver.query.OFOpticalSwitch13LambdaQuery"/> 169 impl="org.onosproject.driver.query.OFOpticalSwitch13LambdaQuery"/>
170 <behaviour api="org.onosproject.net.optical.OpticalDevice" 170 <behaviour api="org.onosproject.net.optical.OpticalDevice"
171 - impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/> 171 + impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
172 </driver> 172 </driver>
173 <driver name="aos" extends="ofdpa" 173 <driver name="aos" extends="ofdpa"
174 manufacturer="Accton" hwVersion=".*" swVersion="1.*"> 174 manufacturer="Accton" hwVersion=".*" swVersion="1.*">
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
184 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" 184 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
185 impl="org.onosproject.driver.handshaker.OplinkRoadmHandshaker"/> 185 impl="org.onosproject.driver.handshaker.OplinkRoadmHandshaker"/>
186 <behaviour api="org.onosproject.net.optical.OpticalDevice" 186 <behaviour api="org.onosproject.net.optical.OpticalDevice"
187 - impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/> 187 + impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
188 </driver> 188 </driver>
189 <driver name="hp" extends="default" 189 <driver name="hp" extends="default"
190 manufacturer="HP" hwVersion="Switch 3500yl-48G" swVersion="K.16.01.0004"> 190 manufacturer="HP" hwVersion="Switch 3500yl-48G" swVersion="K.16.01.0004">
......
...@@ -19,7 +19,6 @@ package org.onosproject.drivers.fujitsu; ...@@ -19,7 +19,6 @@ package org.onosproject.drivers.fujitsu;
19 import org.apache.felix.scr.annotations.Component; 19 import org.apache.felix.scr.annotations.Component;
20 import org.onosproject.net.driver.AbstractDriverLoader; 20 import org.onosproject.net.driver.AbstractDriverLoader;
21 import org.onosproject.net.optical.OpticalDevice; 21 import org.onosproject.net.optical.OpticalDevice;
22 -import org.onosproject.net.optical.device.DefaultOpticalDevice;
23 22
24 /** 23 /**
25 * Loader for Fujitsu device drivers. 24 * Loader for Fujitsu device drivers.
...@@ -30,8 +29,6 @@ public class FujitsuDriversLoader extends AbstractDriverLoader { ...@@ -30,8 +29,6 @@ public class FujitsuDriversLoader extends AbstractDriverLoader {
30 // OSGI: help bundle plugin discover runtime package dependency. 29 // OSGI: help bundle plugin discover runtime package dependency.
31 @SuppressWarnings("unused") 30 @SuppressWarnings("unused")
32 private OpticalDevice optical; 31 private OpticalDevice optical;
33 - @SuppressWarnings("unused")
34 - private DefaultOpticalDevice driver;
35 32
36 public FujitsuDriversLoader() { 33 public FujitsuDriversLoader() {
37 super("/fujitsu-drivers.xml"); 34 super("/fujitsu-drivers.xml");
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <behaviour api="org.onosproject.net.behaviour.PortDiscovery" 19 <behaviour api="org.onosproject.net.behaviour.PortDiscovery"
20 impl="org.onosproject.drivers.fujitsu.PortGetterFujitsuImpl"/> 20 impl="org.onosproject.drivers.fujitsu.PortGetterFujitsuImpl"/>
21 <behaviour api="org.onosproject.net.optical.OpticalDevice" 21 <behaviour api="org.onosproject.net.optical.OpticalDevice"
22 - impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/> 22 + impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
23 </driver> 23 </driver>
24 </drivers> 24 </drivers>
25 25
......
...@@ -19,7 +19,6 @@ package org.onosproject.drivers.lumentum; ...@@ -19,7 +19,6 @@ package org.onosproject.drivers.lumentum;
19 import org.apache.felix.scr.annotations.Component; 19 import org.apache.felix.scr.annotations.Component;
20 import org.onosproject.net.driver.AbstractDriverLoader; 20 import org.onosproject.net.driver.AbstractDriverLoader;
21 import org.onosproject.net.optical.OpticalDevice; 21 import org.onosproject.net.optical.OpticalDevice;
22 -import org.onosproject.net.optical.device.DefaultOpticalDevice;
23 22
24 /** 23 /**
25 * Loader for Lumentum device drivers from specific xml. 24 * Loader for Lumentum device drivers from specific xml.
...@@ -30,8 +29,6 @@ public class LumentumDriversLoader extends AbstractDriverLoader { ...@@ -30,8 +29,6 @@ public class LumentumDriversLoader extends AbstractDriverLoader {
30 // OSGI: help bundle plugin discover runtime package dependency. 29 // OSGI: help bundle plugin discover runtime package dependency.
31 @SuppressWarnings("unused") 30 @SuppressWarnings("unused")
32 private OpticalDevice optical; 31 private OpticalDevice optical;
33 - @SuppressWarnings("unused")
34 - private DefaultOpticalDevice driver;
35 32
36 public LumentumDriversLoader() { 33 public LumentumDriversLoader() {
37 super("/lumentum-drivers.xml"); 34 super("/lumentum-drivers.xml");
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer" 25 <behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
26 impl="org.onosproject.drivers.lumentum.LumentumAlarmConsumer"/> 26 impl="org.onosproject.drivers.lumentum.LumentumAlarmConsumer"/>
27 <behaviour api="org.onosproject.net.optical.OpticalDevice" 27 <behaviour api="org.onosproject.net.optical.OpticalDevice"
28 - impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/> 28 + impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
29 </driver> 29 </driver>
30 </drivers> 30 </drivers>
31 31
......