Sho SHIMIZU
Committed by Gerrit Code Review

Place OchSginalType in the right place

Move from org.onosproject.net.tunnel to org.onosproject.net.tunnel

Change-Id: I48c9de056edcb21ed97514a8fb5e72068d9672f4
...@@ -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.tunnel; 16 +package org.onosproject.net;
17 17
18 /** 18 /**
19 * Represents OCh (Optical Channel) signal type defined in 19 * Represents OCh (Optical Channel) signal type defined in
......
...@@ -25,7 +25,7 @@ import org.onlab.packet.Ip6Address; ...@@ -25,7 +25,7 @@ import org.onlab.packet.Ip6Address;
25 import org.onlab.packet.MacAddress; 25 import org.onlab.packet.MacAddress;
26 import org.onlab.packet.MplsLabel; 26 import org.onlab.packet.MplsLabel;
27 import org.onlab.packet.VlanId; 27 import org.onlab.packet.VlanId;
28 -import org.onosproject.net.tunnel.OchSignalType; 28 +import org.onosproject.net.OchSignalType;
29 29
30 /** 30 /**
31 * Factory class to create various traffic selection criteria. 31 * Factory class to create various traffic selection criteria.
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 package org.onosproject.net.flow.criteria; 16 package org.onosproject.net.flow.criteria;
17 17
18 import com.google.common.base.MoreObjects; 18 import com.google.common.base.MoreObjects;
19 -import org.onosproject.net.tunnel.OchSignalType; 19 +import org.onosproject.net.OchSignalType;
20 20
21 import java.util.Objects; 21 import java.util.Objects;
22 22
......
...@@ -27,7 +27,7 @@ import org.onlab.packet.MplsLabel; ...@@ -27,7 +27,7 @@ import org.onlab.packet.MplsLabel;
27 import org.onlab.packet.VlanId; 27 import org.onlab.packet.VlanId;
28 28
29 import com.google.common.testing.EqualsTester; 29 import com.google.common.testing.EqualsTester;
30 -import org.onosproject.net.tunnel.OchSignalType; 30 +import org.onosproject.net.OchSignalType;
31 31
32 import static org.hamcrest.MatcherAssert.assertThat; 32 import static org.hamcrest.MatcherAssert.assertThat;
33 import static org.hamcrest.Matchers.equalTo; 33 import static org.hamcrest.Matchers.equalTo;
......