Committed by
Yuta HIGUCHI
[ONOS-4513] Move utilities not specific to optical out of optical package.
Change-Id: Ib4d33008c61f17b8ff220142a0d15db31e5fcfb9
Showing
10 changed files
with
10 additions
and
10 deletions
| ... | @@ -32,7 +32,7 @@ import org.onosproject.net.optical.device.port.OduCltPortMapper; | ... | @@ -32,7 +32,7 @@ import org.onosproject.net.optical.device.port.OduCltPortMapper; |
| 32 | import org.onosproject.net.optical.device.port.OmsPortMapper; | 32 | import org.onosproject.net.optical.device.port.OmsPortMapper; |
| 33 | import org.onosproject.net.optical.device.port.OtuPortMapper; | 33 | import org.onosproject.net.optical.device.port.OtuPortMapper; |
| 34 | import org.onosproject.net.optical.device.port.PortMapper; | 34 | import org.onosproject.net.optical.device.port.PortMapper; |
| 35 | -import org.onosproject.net.optical.utils.ForwardingDevice; | 35 | +import org.onosproject.net.utils.ForwardingDevice; |
| 36 | import org.slf4j.Logger; | 36 | import org.slf4j.Logger; |
| 37 | 37 | ||
| 38 | import com.google.common.annotations.Beta; | 38 | import com.google.common.annotations.Beta; | ... | ... |
| ... | @@ -25,7 +25,7 @@ import org.onosproject.net.device.DeviceEvent; | ... | @@ -25,7 +25,7 @@ import org.onosproject.net.device.DeviceEvent; |
| 25 | import org.onosproject.net.device.DeviceListener; | 25 | import org.onosproject.net.device.DeviceListener; |
| 26 | import org.onosproject.net.device.DeviceService; | 26 | import org.onosproject.net.device.DeviceService; |
| 27 | import org.onosproject.net.optical.OpticalDevice; | 27 | import org.onosproject.net.optical.OpticalDevice; |
| 28 | -import org.onosproject.net.optical.utils.ForwardingDeviceService; | 28 | +import org.onosproject.net.utils.ForwardingDeviceService; |
| 29 | import org.slf4j.Logger; | 29 | import org.slf4j.Logger; |
| 30 | 30 | ||
| 31 | import com.google.common.annotations.Beta; | 31 | import com.google.common.annotations.Beta; | ... | ... |
| ... | @@ -20,7 +20,7 @@ import org.onosproject.net.OchSignal; | ... | @@ -20,7 +20,7 @@ import org.onosproject.net.OchSignal; |
| 20 | import org.onosproject.net.OduSignalType; | 20 | import org.onosproject.net.OduSignalType; |
| 21 | import org.onosproject.net.Port; | 21 | import org.onosproject.net.Port; |
| 22 | import org.onosproject.net.optical.OchPort; | 22 | import org.onosproject.net.optical.OchPort; |
| 23 | -import org.onosproject.net.optical.utils.ForwardingPort; | 23 | +import org.onosproject.net.utils.ForwardingPort; |
| 24 | 24 | ||
| 25 | import com.google.common.annotations.Beta; | 25 | import com.google.common.annotations.Beta; |
| 26 | 26 | ... | ... |
| ... | @@ -22,7 +22,7 @@ import java.util.Objects; | ... | @@ -22,7 +22,7 @@ import java.util.Objects; |
| 22 | import org.onosproject.net.CltSignalType; | 22 | import org.onosproject.net.CltSignalType; |
| 23 | import org.onosproject.net.Port; | 23 | import org.onosproject.net.Port; |
| 24 | import org.onosproject.net.optical.OduCltPort; | 24 | import org.onosproject.net.optical.OduCltPort; |
| 25 | -import org.onosproject.net.optical.utils.ForwardingPort; | 25 | +import org.onosproject.net.utils.ForwardingPort; |
| 26 | 26 | ||
| 27 | import com.google.common.annotations.Beta; | 27 | import com.google.common.annotations.Beta; |
| 28 | 28 | ... | ... |
| ... | @@ -22,7 +22,7 @@ import java.util.Objects; | ... | @@ -22,7 +22,7 @@ import java.util.Objects; |
| 22 | import org.onlab.util.Frequency; | 22 | import org.onlab.util.Frequency; |
| 23 | import org.onosproject.net.Port; | 23 | import org.onosproject.net.Port; |
| 24 | import org.onosproject.net.optical.OmsPort; | 24 | import org.onosproject.net.optical.OmsPort; |
| 25 | -import org.onosproject.net.optical.utils.ForwardingPort; | 25 | +import org.onosproject.net.utils.ForwardingPort; |
| 26 | 26 | ||
| 27 | import com.google.common.annotations.Beta; | 27 | import com.google.common.annotations.Beta; |
| 28 | 28 | ... | ... |
| ... | @@ -22,7 +22,7 @@ import java.util.Objects; | ... | @@ -22,7 +22,7 @@ import java.util.Objects; |
| 22 | import org.onosproject.net.OtuSignalType; | 22 | import org.onosproject.net.OtuSignalType; |
| 23 | import org.onosproject.net.Port; | 23 | import org.onosproject.net.Port; |
| 24 | import org.onosproject.net.optical.OtuPort; | 24 | import org.onosproject.net.optical.OtuPort; |
| 25 | -import org.onosproject.net.optical.utils.ForwardingPort; | 25 | +import org.onosproject.net.utils.ForwardingPort; |
| 26 | 26 | ||
| 27 | import com.google.common.annotations.Beta; | 27 | import com.google.common.annotations.Beta; |
| 28 | 28 | ... | ... |
| ... | @@ -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.utils; | 16 | +package org.onosproject.net.utils; |
| 17 | 17 | ||
| 18 | import org.onlab.packet.ChassisId; | 18 | import org.onlab.packet.ChassisId; |
| 19 | import org.onosproject.net.Annotations; | 19 | import org.onosproject.net.Annotations; | ... | ... |
| ... | @@ -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.utils; | 16 | +package org.onosproject.net.utils; |
| 17 | 17 | ||
| 18 | import static com.google.common.base.Preconditions.checkNotNull; | 18 | import static com.google.common.base.Preconditions.checkNotNull; |
| 19 | 19 | ... | ... |
| ... | @@ -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.utils; | 16 | +package org.onosproject.net.utils; |
| 17 | 17 | ||
| 18 | import static com.google.common.base.Preconditions.checkNotNull; | 18 | import static com.google.common.base.Preconditions.checkNotNull; |
| 19 | 19 | ... | ... |
-
Please register or login to post a comment