1 files changed, 0 insertions, 138 deletions
diff --git a/framework/src/onos/core/api/src/test/java/org/onosproject/net/NetTestTools.java b/framework/src/onos/core/api/src/test/java/org/onosproject/net/NetTestTools.java
deleted file mode 100644
index 176fe40c..00000000
--- a/framework/src/onos/core/api/src/test/java/org/onosproject/net/NetTestTools.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2014-2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.net;
-
-import org.onlab.junit.TestUtils;
-import org.onlab.packet.ChassisId;
-import org.onosproject.TestApplicationId;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.event.EventDeliveryService;
-import org.onosproject.net.provider.ProviderId;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.onlab.packet.MacAddress.valueOf;
-import static org.onlab.packet.VlanId.vlanId;
-import static org.onosproject.net.DeviceId.deviceId;
-import static org.onosproject.net.HostId.hostId;
-import static org.onosproject.net.PortNumber.portNumber;
-
-/**
- * Miscellaneous tools for testing core related to the network model.
- */
-public final class NetTestTools {
-
-    private NetTestTools() {
-    }
-
-    public static final ProviderId PID = new ProviderId("of", "foo");
-    public static final ApplicationId APP_ID = new TestApplicationId("foo");
-
-    // Short-hand for producing a device id from a string
-    public static DeviceId did(String id) {
-        return deviceId("of:" + id);
-    }
-
-
-    // Short-hand for producing a host id from a string
-    public static HostId hid(String id) {
-        return hostId(id);
-    }
-
-    // Crates a new device with the specified id
-    public static Device device(String id) {
-        return new DefaultDevice(PID, did(id), Device.Type.SWITCH,
-                                 "mfg", "1.0", "1.1", "1234", new ChassisId());
-    }
-
-    // Crates a new host with the specified id
-    public static Host host(String id, String did) {
-        return new DefaultHost(PID, hid(id), valueOf(1234), vlanId((short) 2),
-                               new HostLocation(did(did), portNumber(1), 321),
-                               new HashSet<>());
-    }
-
-    // Short-hand for creating a connection point.
-    public static ConnectPoint connectPoint(String id, int port) {
-        return new ConnectPoint(did(id), portNumber(port));
-    }
-
-    // Short-hand for creating a link.
-    public static Link link(String src, int sp, String dst, int dp) {
-        return new DefaultLink(PID,
-                               connectPoint(src, sp),
-                               connectPoint(dst, dp),
-                               Link.Type.DIRECT);
-    }
-
-    // Creates a path that leads through the given devices.
-    public static Path createPath(String... ids) {
-        List<Link> links = new ArrayList<>();
-        for (int i = 0; i < ids.length - 1; i++) {
-            links.add(link(ids[i], i, ids[i + 1], i));
-        }
-        return new DefaultPath(PID, links, ids.length);
-    }
-
-    // Creates OCh signal
-    public static OchSignal createLambda() {
-        return new OchSignal(GridType.DWDM, ChannelSpacing.CHL_6P25GHZ, 8, 4);
-    }
-
-    /**
-     * Verifies that Annotations created by merging {@code annotations} is
-     * equal to actual Annotations.
-     *
-     * @param actual      annotations to check
-     * @param annotations expected annotations
-     */
-    public static void assertAnnotationsEquals(Annotations actual, SparseAnnotations... annotations) {
-        DefaultAnnotations expected = DefaultAnnotations.builder().build();
-        for (SparseAnnotations a : annotations) {
-            expected = DefaultAnnotations.merge(expected, a);
-        }
-        assertEquals(expected.keys(), actual.keys());
-        for (String key : expected.keys()) {
-            assertEquals(expected.value(key), actual.value(key));
-        }
-    }
-
-    /**
-     * Injects the given event delivery service into the specified manager
-     * component.
-     *
-     * @param manager manager component
-     * @param svc     service reference to be injected
-     */
-    public static void injectEventDispatcher(Object manager, EventDeliveryService svc) {
-        Class mc = manager.getClass();
-        for (Field f : mc.getSuperclass().getDeclaredFields()) {
-            if (f.getType().equals(EventDeliveryService.class)) {
-                try {
-                    TestUtils.setField(manager, f.getName(), svc);
-                } catch (TestUtils.TestUtilsException e) {
-                    throw new IllegalArgumentException("Unable to inject reference", e);
-                }
-                break;
-            }
-        }
-    }
-
-}