mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 04:06:49 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I88db1508290e8d3722d46e85b947b4fdc9f4b66d
This commit is contained in:
HIGUCHI Yuta 2016-05-11 09:50:39 -07:00 committed by Gerrit Code Review
parent b1548eeffa
commit deae31ec05
8 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/api/src/main/java/org/onosproject/net/optical/device/DefaultOpticalDevice.java → core/api/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.net.optical.device;
package org.onosproject.net.optical;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
@ -27,11 +27,6 @@ import org.onosproject.net.Port;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.driver.AbstractBehaviour;
import org.onosproject.net.driver.DriverData;
import org.onosproject.net.optical.OchPort;
import org.onosproject.net.optical.OduCltPort;
import org.onosproject.net.optical.OmsPort;
import org.onosproject.net.optical.OpticalDevice;
import org.onosproject.net.optical.OtuPort;
import org.onosproject.net.optical.device.port.OchPortMapper;
import org.onosproject.net.optical.device.port.OduCltPortMapper;
import org.onosproject.net.optical.device.port.OmsPortMapper;
@ -44,14 +39,15 @@ import com.google.common.annotations.Beta;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableMap;
// FIXME This needs to be moved back to org.onosproject.net.optical.impl
// after optical driver package separation process is complete.
/**
* Implementation of {@link OpticalDevice}.
* <p>
* Currently supports
* <ul>
* <li> {@link OchPort}
* <li> {@link OmsPort}
* <li> {@link OduCltPort}
* <li> {@link OtuPort}
* </ul>
*/
@Beta

3
drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaDriversLoader.java
View File

@ -19,7 +19,6 @@ package org.onosproject.drivers.ciena;
import org.apache.felix.scr.annotations.Component;
import org.onosproject.net.driver.AbstractDriverLoader;
import org.onosproject.net.optical.OpticalDevice;
import org.onosproject.net.optical.device.DefaultOpticalDevice;
/**
* Loader for Ciena device drivers.
@ -30,8 +29,6 @@ public class CienaDriversLoader extends AbstractDriverLoader {
// OSGI: help bundle plugin discover runtime package dependency.
@SuppressWarnings("unused")
private OpticalDevice optical;
@SuppressWarnings("unused")
private DefaultOpticalDevice driver;
public CienaDriversLoader() {
super("/ciena-drivers.xml");

2
drivers/ciena/src/main/resources/ciena-drivers.xml
View File

@ -19,7 +19,7 @@
<behaviour api="org.onosproject.net.behaviour.PortDiscovery"
impl="org.onosproject.drivers.ciena.PortDiscoveryCienaWaveserverImpl"/>
<behaviour api="org.onosproject.net.optical.OpticalDevice"
impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/>
impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
</driver>
</drivers>

6
drivers/default/src/main/resources/onos-drivers.xml
View File

@ -62,7 +62,7 @@
<behaviour api="org.onosproject.net.behaviour.LambdaQuery"
impl="org.onosproject.driver.query.LincOELambdaQuery"/>
<behaviour api="org.onosproject.net.optical.OpticalDevice"
impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/>
impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
</driver>
<driver name="ofdpa" extends="default"
manufacturer="Broadcom Corp." hwVersion="OF-DPA.*" swVersion="OF-DPA.*">
@ -168,7 +168,7 @@
<behaviour api="org.onosproject.net.behaviour.LambdaQuery"
impl="org.onosproject.driver.query.OFOpticalSwitch13LambdaQuery"/>
<behaviour api="org.onosproject.net.optical.OpticalDevice"
impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/>
impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
</driver>
<driver name="aos" extends="ofdpa"
manufacturer="Accton" hwVersion=".*" swVersion="1.*">
@ -184,7 +184,7 @@
<behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
impl="org.onosproject.driver.handshaker.OplinkRoadmHandshaker"/>
<behaviour api="org.onosproject.net.optical.OpticalDevice"
impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/>
impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
</driver>
<driver name="hp" extends="default"
manufacturer="HP" hwVersion="Switch 3500yl-48G" swVersion="K.16.01.0004">

3
drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuDriversLoader.java
View File

@ -19,7 +19,6 @@ package org.onosproject.drivers.fujitsu;
import org.apache.felix.scr.annotations.Component;
import org.onosproject.net.driver.AbstractDriverLoader;
import org.onosproject.net.optical.OpticalDevice;
import org.onosproject.net.optical.device.DefaultOpticalDevice;
/**
* Loader for Fujitsu device drivers.
@ -30,8 +29,6 @@ public class FujitsuDriversLoader extends AbstractDriverLoader {
// OSGI: help bundle plugin discover runtime package dependency.
@SuppressWarnings("unused")
private OpticalDevice optical;
@SuppressWarnings("unused")
private DefaultOpticalDevice driver;
public FujitsuDriversLoader() {
super("/fujitsu-drivers.xml");

2
drivers/fujitsu/src/main/resources/fujitsu-drivers.xml
View File

@ -19,7 +19,7 @@
<behaviour api="org.onosproject.net.behaviour.PortDiscovery"
impl="org.onosproject.drivers.fujitsu.PortGetterFujitsuImpl"/>
<behaviour api="org.onosproject.net.optical.OpticalDevice"
impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/>
impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
</driver>
</drivers>

3
drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumDriversLoader.java
View File

@ -19,7 +19,6 @@ package org.onosproject.drivers.lumentum;
import org.apache.felix.scr.annotations.Component;
import org.onosproject.net.driver.AbstractDriverLoader;
import org.onosproject.net.optical.OpticalDevice;
import org.onosproject.net.optical.device.DefaultOpticalDevice;
/**
* Loader for Lumentum device drivers from specific xml.
@ -30,8 +29,6 @@ public class LumentumDriversLoader extends AbstractDriverLoader {
// OSGI: help bundle plugin discover runtime package dependency.
@SuppressWarnings("unused")
private OpticalDevice optical;
@SuppressWarnings("unused")
private DefaultOpticalDevice driver;
public LumentumDriversLoader() {
super("/lumentum-drivers.xml");

2
drivers/lumentum/src/main/resources/lumentum-drivers.xml
View File

@ -25,7 +25,7 @@
<behaviour api="org.onosproject.incubator.net.faultmanagement.alarm.AlarmConsumer"
impl="org.onosproject.drivers.lumentum.LumentumAlarmConsumer"/>
<behaviour api="org.onosproject.net.optical.OpticalDevice"
impl="org.onosproject.net.optical.device.DefaultOpticalDevice"/>
impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
</driver>
</drivers>