[ONOS-4513] Move utilities not specific to optical out of optical package.
Change-Id: Ib4d33008c61f17b8ff220142a0d15db31e5fcfb9
diff --git a/core/api/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java b/core/api/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java
index 23f3c57..c5b1ff0 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java
+++ b/core/api/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java
@@ -32,7 +32,7 @@
import org.onosproject.net.optical.device.port.OmsPortMapper;
import org.onosproject.net.optical.device.port.OtuPortMapper;
import org.onosproject.net.optical.device.port.PortMapper;
-import org.onosproject.net.optical.utils.ForwardingDevice;
+import org.onosproject.net.utils.ForwardingDevice;
import org.slf4j.Logger;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/OpticalDeviceServiceView.java b/core/api/src/main/java/org/onosproject/net/optical/device/OpticalDeviceServiceView.java
index c898f70..da4da82 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/device/OpticalDeviceServiceView.java
+++ b/core/api/src/main/java/org/onosproject/net/optical/device/OpticalDeviceServiceView.java
@@ -25,7 +25,7 @@
import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.optical.OpticalDevice;
-import org.onosproject.net.optical.utils.ForwardingDeviceService;
+import org.onosproject.net.utils.ForwardingDeviceService;
import org.slf4j.Logger;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java b/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
index 019f8c9..593b021 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
+++ b/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
@@ -20,7 +20,7 @@
import org.onosproject.net.OduSignalType;
import org.onosproject.net.Port;
import org.onosproject.net.optical.OchPort;
-import org.onosproject.net.optical.utils.ForwardingPort;
+import org.onosproject.net.utils.ForwardingPort;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOduCltPort.java b/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOduCltPort.java
index f98becd..78a4266 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOduCltPort.java
+++ b/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOduCltPort.java
@@ -22,7 +22,7 @@
import org.onosproject.net.CltSignalType;
import org.onosproject.net.Port;
import org.onosproject.net.optical.OduCltPort;
-import org.onosproject.net.optical.utils.ForwardingPort;
+import org.onosproject.net.utils.ForwardingPort;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOmsPort.java b/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOmsPort.java
index 4c1c7e3..eb2c426 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOmsPort.java
+++ b/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOmsPort.java
@@ -22,7 +22,7 @@
import org.onlab.util.Frequency;
import org.onosproject.net.Port;
import org.onosproject.net.optical.OmsPort;
-import org.onosproject.net.optical.utils.ForwardingPort;
+import org.onosproject.net.utils.ForwardingPort;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java b/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
index 4a5a79b..2c038c8 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
+++ b/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
@@ -22,7 +22,7 @@
import org.onosproject.net.OtuSignalType;
import org.onosproject.net.Port;
import org.onosproject.net.optical.OtuPort;
-import org.onosproject.net.optical.utils.ForwardingPort;
+import org.onosproject.net.utils.ForwardingPort;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingDevice.java b/core/api/src/main/java/org/onosproject/net/utils/ForwardingDevice.java
similarity index 97%
rename from core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingDevice.java
rename to core/api/src/main/java/org/onosproject/net/utils/ForwardingDevice.java
index 389f42b..e910ce5 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingDevice.java
+++ b/core/api/src/main/java/org/onosproject/net/utils/ForwardingDevice.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.optical.utils;
+package org.onosproject.net.utils;
import org.onlab.packet.ChassisId;
import org.onosproject.net.Annotations;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingDeviceService.java b/core/api/src/main/java/org/onosproject/net/utils/ForwardingDeviceService.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingDeviceService.java
rename to core/api/src/main/java/org/onosproject/net/utils/ForwardingDeviceService.java
index 7bcec14..91885ba 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingDeviceService.java
+++ b/core/api/src/main/java/org/onosproject/net/utils/ForwardingDeviceService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.optical.utils;
+package org.onosproject.net.utils;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingPort.java b/core/api/src/main/java/org/onosproject/net/utils/ForwardingPort.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingPort.java
rename to core/api/src/main/java/org/onosproject/net/utils/ForwardingPort.java
index f241625..7485b1e 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/utils/ForwardingPort.java
+++ b/core/api/src/main/java/org/onosproject/net/utils/ForwardingPort.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.optical.utils;
+package org.onosproject.net.utils;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/api/src/main/java/org/onosproject/net/optical/utils/package-info.java b/core/api/src/main/java/org/onosproject/net/utils/package-info.java
similarity index 93%
rename from core/api/src/main/java/org/onosproject/net/optical/utils/package-info.java
rename to core/api/src/main/java/org/onosproject/net/utils/package-info.java
index ae8d0b5..da3860a 100644
--- a/core/api/src/main/java/org/onosproject/net/optical/utils/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/utils/package-info.java
@@ -17,4 +17,4 @@
/**
* Utility classes.
*/
-package org.onosproject.net.optical.utils;
+package org.onosproject.net.utils;