Abondon the concept of resources under a link

Resources under a link are tied to resources under both ends of the link,
and resources under a port are thought to be first-class objects compared
to concept of link resources. We will deal with only device related
resources from now on.

Change-Id: I6aa418d1bf64b28374f325db0bc7e393f770dcdd

@@ -18,9 +18,7 @@ package org.onosproject.net.newresource;
 import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 import org.onlab.packet.VlanId;
-import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
-import org.onosproject.net.LinkKey;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.intent.IntentId;
 
@@ -29,18 +27,14 @@ public class ResourceAllocationTest {
     private static final DeviceId D1 = DeviceId.deviceId("of:001");
     private static final DeviceId D2 = DeviceId.deviceId("of:002");
     private static final PortNumber P1 = PortNumber.portNumber(1);
-    private static final ConnectPoint CP1_1 = new ConnectPoint(D1, P1);
-    private static final ConnectPoint CP2_1 = new ConnectPoint(D2, P1);
     private static final VlanId VLAN1 = VlanId.vlanId((short) 100);
     private static final IntentId IID1 = IntentId.valueOf(30);
-    private static final LinkKey LK1 = LinkKey.linkKey(CP1_1, CP2_1);
-    private static final LinkKey LK2 = LinkKey.linkKey(CP2_1, CP1_1);
 
     @Test
     public void testEquals() {
-        ResourceAllocation alloc1 = new ResourceAllocation(ResourcePath.discrete(LK1, VLAN1), IID1);
-        ResourceAllocation sameAsAlloc1 = new ResourceAllocation(ResourcePath.discrete(LK1, VLAN1), IID1);
-        ResourceAllocation alloc2 = new ResourceAllocation(ResourcePath.discrete(LK2, VLAN1), IID1);
+        ResourceAllocation alloc1 = new ResourceAllocation(ResourcePath.discrete(D1, P1, VLAN1), IID1);
+        ResourceAllocation sameAsAlloc1 = new ResourceAllocation(ResourcePath.discrete(D1, P1, VLAN1), IID1);
+        ResourceAllocation alloc2 = new ResourceAllocation(ResourcePath.discrete(D2, P1, VLAN1), IID1);
 
         new EqualsTester()
                 .addEqualityGroup(alloc1, sameAsAlloc1)

@@ -19,9 +19,7 @@ import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 import org.onlab.packet.VlanId;
 import org.onlab.util.Bandwidth;
-import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
-import org.onosproject.net.LinkKey;
 import org.onosproject.net.PortNumber;
 
 import java.util.Optional;
@@ -35,19 +33,17 @@ public class ResourcePathTest {
     private static final DeviceId D1 = DeviceId.deviceId("of:001");
     private static final DeviceId D2 = DeviceId.deviceId("of:002");
     private static final PortNumber P1 = PortNumber.portNumber(1);
-    private static final ConnectPoint CP1_1 = new ConnectPoint(D1, P1);
-    private static final ConnectPoint CP2_1 = new ConnectPoint(D2, P1);
     private static final VlanId VLAN1 = VlanId.vlanId((short) 100);
     private static final Bandwidth BW1 = Bandwidth.gbps(2);
     private static final Bandwidth BW2 = Bandwidth.gbps(1);
 
     @Test
     public void testEquals() {
-        ResourcePath resource1 = ResourcePath.discrete(LinkKey.linkKey(CP1_1, CP2_1), VLAN1);
-        ResourcePath sameAsResource1 = ResourcePath.discrete(LinkKey.linkKey(CP1_1, CP2_1), VLAN1);
-        ResourcePath resource2 = ResourcePath.discrete(LinkKey.linkKey(CP2_1, CP1_1), VLAN1);
-        ResourcePath resource3 = ResourcePath.continuous(BW1.bps(), LinkKey.linkKey(CP1_1, CP2_1), BW1);
-        ResourcePath sameAsResource3 = ResourcePath.continuous(BW2.bps(), LinkKey.linkKey(CP1_1, CP2_1), BW1);
+        ResourcePath resource1 = ResourcePath.discrete(D1, P1, VLAN1);
+        ResourcePath sameAsResource1 = ResourcePath.discrete(D1, P1, VLAN1);
+        ResourcePath resource2 = ResourcePath.discrete(D2, P1, VLAN1);
+        ResourcePath resource3 = ResourcePath.continuous(BW1.bps(), D1, P1, BW1);
+        ResourcePath sameAsResource3 = ResourcePath.continuous(BW2.bps(), D1, P1, BW1);
 
         new EqualsTester()
                 .addEqualityGroup(resource1, sameAsResource1)
@@ -72,25 +68,24 @@ public class ResourcePathTest {
 
     @Test
     public void testThereIsParent() {
-        ResourcePath path = ResourcePath.discrete(LinkKey.linkKey(CP1_1, CP2_1), VLAN1);
-        ResourcePath parent = ResourcePath.discrete(LinkKey.linkKey(CP1_1, CP2_1));
+        ResourcePath path = ResourcePath.discrete(D1, P1, VLAN1);
+        ResourcePath parent = ResourcePath.discrete(D1, P1);
 
         assertThat(path.parent(), is(Optional.of(parent)));
     }
 
     @Test
     public void testNoParent() {
-        ResourcePath path = ResourcePath.discrete(LinkKey.linkKey(CP1_1, CP2_1));
+        ResourcePath path = ResourcePath.discrete(D1);
 
         assertThat(path.parent(), is(Optional.of(ResourcePath.ROOT)));
     }
 
     @Test
     public void testBase() {
-        LinkKey linkKey = LinkKey.linkKey(CP1_1, CP2_1);
-        ResourcePath path = ResourcePath.discrete(linkKey);
+        ResourcePath path = ResourcePath.discrete(D1);
 
-        LinkKey child = (LinkKey) path.last();
-        assertThat(child, is(linkKey));
+        DeviceId child = (DeviceId) path.last();
+        assertThat(child, is(D1));
     }
 }

@@ -34,6 +34,7 @@ import org.onosproject.net.HostId;
 import org.onosproject.net.Link;
 import org.onosproject.net.LinkKey;
 import org.onosproject.net.NetworkResource;
+import org.onosproject.net.PortNumber;
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceService;
@@ -302,11 +303,11 @@ public class ObjectiveTracker implements ObjectiveTrackerService {
     private class InternalResourceListener implements ResourceListener {
         @Override
         public void event(ResourceEvent event) {
-            Optional<Class<?>> linkEvent = event.subject().components().stream()
+            Optional<Class<?>> deviceEvent = event.subject().components().stream()
                     .map(Object::getClass)
-                    .filter(x -> x == LinkKey.class)
+                    .filter(x -> x == PortNumber.class)
                     .findFirst();
-            if (linkEvent.isPresent()) {
+            if (deviceEvent.isPresent()) {
                 executorService.execute(() -> {
                     if (delegate == null) {
                         return;

@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.intent.impl.compiler;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 
 import org.apache.felix.scr.annotations.Activate;
@@ -59,9 +60,9 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.net.LinkKey.linkKey;
@@ -120,11 +121,16 @@ public class MplsPathIntentCompiler implements IntentCompiler<MplsPathIntent> {
             return Collections.emptyMap();
         }
 
-        List<ResourcePath> resources = labels.entrySet().stream()
-                .map(x -> ResourcePath.discrete(linkKey(x.getKey().src(), x.getKey().src()), x.getValue()))
-                .collect(Collectors.toList());
+        // for short term solution: same label is used for both directions
+        // TODO: introduce the concept of Tx and Rx resources of a port
+        Set<ResourcePath> resources = labels.entrySet().stream()
+                .flatMap(x -> Stream.of(
+                        ResourcePath.discrete(x.getKey().src().deviceId(), x.getKey().src().port(), x.getValue()),
+                        ResourcePath.discrete(x.getKey().dst().deviceId(), x.getKey().dst().port(), x.getValue())
+                ))
+                .collect(Collectors.toSet());
         List<org.onosproject.net.newresource.ResourceAllocation> allocations =
-                resourceService.allocate(intent.id(), resources);
+                resourceService.allocate(intent.id(), ImmutableList.copyOf(resources));
         if (allocations.isEmpty()) {
             Collections.emptyMap();
         }
@@ -135,20 +141,23 @@ public class MplsPathIntentCompiler implements IntentCompiler<MplsPathIntent> {
     private Map<LinkKey, MplsLabel> findMplsLabels(Set<LinkKey> links) {
         Map<LinkKey, MplsLabel> labels = new HashMap<>();
         for (LinkKey link : links) {
-            Optional<MplsLabel> label = findMplsLabel(link);
-            if (label.isPresent()) {
-                labels.put(link, label.get());
+            Set<MplsLabel> forward = findMplsLabel(link.src());
+            Set<MplsLabel> backward = findMplsLabel(link.dst());
+            Set<MplsLabel> common = Sets.intersection(forward, backward);
+            if (common.isEmpty()) {
+                continue;
             }
+            labels.put(link, common.iterator().next());
         }
 
         return labels;
     }
 
-    private Optional<MplsLabel> findMplsLabel(LinkKey link) {
-        return resourceService.getAvailableResources(ResourcePath.discrete(link)).stream()
+    private Set<MplsLabel> findMplsLabel(ConnectPoint cp) {
+        return resourceService.getAvailableResources(ResourcePath.discrete(cp.deviceId(), cp.port())).stream()
                 .filter(x -> x.last() instanceof MplsLabel)
                 .map(x -> (MplsLabel) x.last())
-                .findFirst();
+                .collect(Collectors.toSet());
     }
 
     private MplsLabel getMplsLabel(Map<LinkKey, MplsLabel> labels, LinkKey link) {

@@ -57,9 +57,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static org.onosproject.net.LinkKey.linkKey;
 
 /**
  * An intent compiler for {@link org.onosproject.net.intent.OpticalConnectivityIntent}.
@@ -182,7 +182,10 @@ public class OpticalConnectivityIntentCompiler implements IntentCompiler<Optical
 
         IndexedLambda minLambda = findFirstLambda(lambdas);
         List<ResourcePath> lambdaResources = path.links().stream()
-                .map(x -> ResourcePath.discrete(linkKey(x.src(), x.dst())))
+                .flatMap(x -> Stream.of(
+                        ResourcePath.discrete(x.src().deviceId(), x.src().port()),
+                        ResourcePath.discrete(x.dst().deviceId(), x.dst().port())
+                ))
                 .map(x -> x.child(minLambda))
                 .collect(Collectors.toList());
 
@@ -197,7 +200,10 @@ public class OpticalConnectivityIntentCompiler implements IntentCompiler<Optical
 
     private Set<IndexedLambda> findCommonLambdasOverLinks(List<Link> links) {
         return links.stream()
-                .map(x -> ResourcePath.discrete(linkKey(x.src(), x.dst())))
+                .flatMap(x -> Stream.of(
+                        ResourcePath.discrete(x.src().deviceId(), x.src().port()),
+                        ResourcePath.discrete(x.dst().deviceId(), x.dst().port())
+                ))
                 .map(resourceService::getAvailableResources)
                 .map(x -> Iterables.filter(x, r -> r.last() instanceof IndexedLambda))
                 .map(x -> Iterables.transform(x, r -> (IndexedLambda) r.last()))

@@ -16,13 +16,22 @@
 package org.onosproject.net.newresource.impl;
 
 import com.google.common.collect.Lists;
+import org.onlab.packet.MplsLabel;
+import org.onlab.packet.VlanId;
+import org.onlab.util.ItemNotFoundException;
 import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
 import org.onosproject.net.Port;
 import org.onosproject.net.OchPort;
+import org.onosproject.net.PortNumber;
 import org.onosproject.net.TributarySlot;
 import org.onosproject.net.OduSignalType;
+import org.onosproject.net.behaviour.MplsQuery;
+import org.onosproject.net.behaviour.VlanQuery;
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.driver.DriverHandler;
+import org.onosproject.net.driver.DriverService;
 import org.onosproject.net.newresource.ResourceAdminService;
 import org.onosproject.net.newresource.ResourcePath;
 import org.slf4j.Logger;
@@ -42,12 +51,19 @@ final class ResourceDeviceListener implements DeviceListener {
 
     private static final Logger log = LoggerFactory.getLogger(ResourceDeviceListener.class);
 
+    private static final int MAX_VLAN_ID = VlanId.MAX_VLAN;
+    private static final List<VlanId> ENTIRE_VLAN_IDS = getEntireVlans();
+
+    private static final int MAX_MPLS_LABEL = 1048576;
+    private static final List<MplsLabel> ENTIRE_MPLS_LABELS = getEntireMplsLabels();
+
     private static final int TOTAL_ODU2_TRIBUTARY_SLOTS = 8;
     private static final int TOTAL_ODU4_TRIBUTARY_SLOTS = 80;
     private static final List<TributarySlot> ENTIRE_ODU2_TRIBUTARY_SLOTS = getEntireOdu2TributarySlots();
     private static final List<TributarySlot> ENTIRE_ODU4_TRIBUTARY_SLOTS = getEntireOdu4TributarySlots();
 
     private final ResourceAdminService adminService;
+    private final DriverService driverService;
     private final ExecutorService executor;
 
     /**
@@ -56,8 +72,10 @@ final class ResourceDeviceListener implements DeviceListener {
      * @param adminService instance invoked to register resources
      * @param executor executor used for processing resource registration
      */
-    ResourceDeviceListener(ResourceAdminService adminService, ExecutorService executor) {
+    ResourceDeviceListener(ResourceAdminService adminService, DriverService driverService,
+                           ExecutorService executor) {
         this.adminService = checkNotNull(adminService);
+        this.driverService = checkNotNull(driverService);
         this.executor = checkNotNull(executor);
     }
 
@@ -95,6 +113,18 @@ final class ResourceDeviceListener implements DeviceListener {
         executor.submit(() -> {
             adminService.registerResources(portPath);
 
+            // for VLAN IDs
+            if (isVlanEnabled(device.id(), port.number())) {
+                adminService.registerResources(Lists.transform(ENTIRE_VLAN_IDS, portPath::child));
+            }
+
+            // for MPLS labels
+            if (isMplsEnabled(device.id(), port.number())) {
+                adminService.registerResources(Lists.transform(ENTIRE_MPLS_LABELS, portPath::child));
+            }
+
+            // for Tributary slots
+            // TODO: need to define Behaviour to make a query about OCh port
             switch (port.type()) {
                 case OCH:
                     // register ODU TributarySlots against the OCH port
@@ -124,15 +154,55 @@ final class ResourceDeviceListener implements DeviceListener {
         executor.submit(() -> adminService.unregisterResources(resource));
     }
 
+    private boolean isVlanEnabled(DeviceId device, PortNumber port) {
+        try {
+            DriverHandler handler = driverService.createHandler(device);
+            if (handler == null) {
+                return false;
+            }
+
+            VlanQuery query = handler.behaviour(VlanQuery.class);
+            return query != null && query.isEnabled(port);
+        } catch (ItemNotFoundException e) {
+            return false;
+        }
+    }
+
+    private boolean isMplsEnabled(DeviceId device, PortNumber port) {
+        try {
+            DriverHandler handler = driverService.createHandler(device);
+            if (handler == null) {
+                return false;
+            }
+
+            MplsQuery query = handler.behaviour(MplsQuery.class);
+            return query != null && query.isEnabled(port);
+        } catch (ItemNotFoundException e) {
+            return false;
+        }
+    }
+
+    private static List<VlanId> getEntireVlans() {
+        return IntStream.range(0, MAX_VLAN_ID)
+                .mapToObj(x -> VlanId.vlanId((short) x))
+                .collect(Collectors.toList());
+    }
+
+    private static List<MplsLabel> getEntireMplsLabels() {
+        // potentially many objects are created
+        return IntStream.range(0, MAX_MPLS_LABEL)
+                .mapToObj(MplsLabel::mplsLabel)
+                .collect(Collectors.toList());
+    }
+
     private static List<TributarySlot> getEntireOdu2TributarySlots() {
         return IntStream.rangeClosed(1, TOTAL_ODU2_TRIBUTARY_SLOTS)
-                .mapToObj(x -> TributarySlot.of(x))
+                .mapToObj(TributarySlot::of)
                 .collect(Collectors.toList());
     }
     private static List<TributarySlot> getEntireOdu4TributarySlots() {
         return IntStream.rangeClosed(1, TOTAL_ODU4_TRIBUTARY_SLOTS)
-                .mapToObj(x -> TributarySlot.of(x))
+                .mapToObj(TributarySlot::of)
                 .collect(Collectors.toList());
     }
-
 }

-/*
- * Copyright 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.newresource.impl;
-
-import com.google.common.collect.Lists;
-import org.onlab.packet.MplsLabel;
-import org.onlab.packet.VlanId;
-import org.onlab.util.ItemNotFoundException;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.Link;
-import org.onosproject.net.LinkKey;
-import org.onosproject.net.behaviour.MplsQuery;
-import org.onosproject.net.behaviour.VlanQuery;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.driver.DriverService;
-import org.onosproject.net.link.LinkEvent;
-import org.onosproject.net.link.LinkListener;
-import org.onosproject.net.newresource.ResourceAdminService;
-import org.onosproject.net.newresource.ResourcePath;
-
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * An implementation of LinkListener registering links as resources.
- */
-final class ResourceLinkListener implements LinkListener {
-
-    private static final int TOTAL_VLANS = 1024;
-    private static final List<VlanId> ENTIRE_VLAN_IDS = getEntireVlans();
-
-    private static final int TOTAL_MPLS_LABELS = 1048576;
-    private static final List<MplsLabel> ENTIRE_MPLS_LABELS = getEntireMplsLabels();
-
-    private final ResourceAdminService adminService;
-    private final DriverService driverService;
-    private final ExecutorService executor;
-
-    /**
-     * Creates an instance with the specified ResourceAdminService and ExecutorService.
-     *
-     * @param adminService instance invoked to register resources
-     * @param driverService driver service instance
-     * @param executor executor used for processing resource registration
-     */
-    ResourceLinkListener(ResourceAdminService adminService, DriverService driverService, ExecutorService executor) {
-        this.adminService = checkNotNull(adminService);
-        this.driverService = checkNotNull(driverService);
-        this.executor = checkNotNull(executor);
-    }
-
-    @Override
-    public void event(LinkEvent event) {
-        Link link = event.subject();
-        switch (event.type()) {
-            case LINK_ADDED:
-                registerLinkResource(link);
-                break;
-            case LINK_REMOVED:
-                unregisterLinkResource(link);
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void registerLinkResource(Link link) {
-        executor.submit(() -> {
-            // register the link
-            LinkKey linkKey = LinkKey.linkKey(link);
-            adminService.registerResources(ResourcePath.discrete(linkKey));
-
-            ResourcePath linkPath = ResourcePath.discrete(linkKey);
-            // register VLAN IDs against the link
-            if (isEnabled(link, this::isVlanEnabled)) {
-                adminService.registerResources(Lists.transform(ENTIRE_VLAN_IDS, linkPath::child));
-            }
-
-            // register MPLS labels against the link
-            if (isEnabled(link, this::isMplsEnabled)) {
-                adminService.registerResources(Lists.transform(ENTIRE_MPLS_LABELS, linkPath::child));
-            }
-        });
-    }
-
-    private void unregisterLinkResource(Link link) {
-        LinkKey linkKey = LinkKey.linkKey(link);
-        executor.submit(() -> adminService.unregisterResources(ResourcePath.discrete(linkKey)));
-    }
-
-    private boolean isEnabled(Link link, Predicate<ConnectPoint> predicate) {
-        return predicate.test(link.src()) && predicate.test(link.dst());
-    }
-
-    private boolean isVlanEnabled(ConnectPoint cp) {
-        try {
-            DriverHandler handler = driverService.createHandler(cp.deviceId());
-            if (handler == null) {
-                return false;
-            }
-
-            VlanQuery query = handler.behaviour(VlanQuery.class);
-            return query != null && query.isEnabled(cp.port());
-        } catch (ItemNotFoundException e) {
-            return false;
-        }
-    }
-
-    private boolean isMplsEnabled(ConnectPoint cp) {
-        try {
-            DriverHandler handler = driverService.createHandler(cp.deviceId());
-            if (handler == null) {
-                return false;
-            }
-
-            MplsQuery query = handler.behaviour(MplsQuery.class);
-            return query != null && query.isEnabled(cp.port());
-        } catch (ItemNotFoundException e) {
-            return false;
-        }
-    }
-
-    private static List<VlanId> getEntireVlans() {
-        return IntStream.range(0, TOTAL_VLANS)
-                .mapToObj(x -> VlanId.vlanId((short) x))
-                .collect(Collectors.toList());
-    }
-
-    private static List<MplsLabel> getEntireMplsLabels() {
-        // potentially many objects are created
-        return IntStream.range(0, TOTAL_MPLS_LABELS)
-                .mapToObj(MplsLabel::mplsLabel)
-                .collect(Collectors.toList());
-    }
-}

@@ -24,8 +24,6 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.driver.DriverService;
-import org.onosproject.net.link.LinkListener;
-import org.onosproject.net.link.LinkService;
 import org.onosproject.net.newresource.ResourceAdminService;
 
 import java.util.concurrent.ExecutorService;
@@ -49,25 +47,18 @@ public final class ResourceRegistrar {
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected DeviceService deviceService;
 
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected LinkService linkService;
-
     private DeviceListener deviceListener;
-    private LinkListener linkListener;
     private final ExecutorService executor =
             Executors.newSingleThreadExecutor(groupedThreads("onos/resource", "registrar"));
 
     @Activate
     public void activate() {
-        deviceListener = new ResourceDeviceListener(adminService, executor);
+        deviceListener = new ResourceDeviceListener(adminService, driverService, executor);
         deviceService.addListener(deviceListener);
-        linkListener = new ResourceLinkListener(adminService, driverService, executor);
-        linkService.addListener(linkListener);
     }
 
     @Deactivate
     public void deactivate() {
         deviceService.removeListener(deviceListener);
-        linkService.removeListener(linkListener);
     }
 }

@@ -29,8 +29,10 @@ import org.onlab.junit.TestUtils.TestUtilsException;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.event.Event;
 import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
 import org.onosproject.net.Link;
 import org.onosproject.net.NetworkResource;
+import org.onosproject.net.PortNumber;
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.intent.Intent;
@@ -52,7 +54,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.onosproject.net.LinkKey.linkKey;
 import static org.onosproject.net.newresource.ResourceEvent.Type.*;
 import static org.onosproject.net.NetTestTools.APP_ID;
 import static org.onosproject.net.NetTestTools.device;
@@ -231,7 +232,7 @@ public class ObjectiveTrackerTest {
     @Test
     public void testResourceEvent() throws Exception {
         ResourceEvent event = new ResourceEvent(RESOURCE_ADDED,
-                ResourcePath.discrete(linkKey(link("a", 1, "b", 1))));
+                ResourcePath.discrete(DeviceId.deviceId("a"), PortNumber.portNumber(1)));
         resourceListener.event(event);
 
         assertThat(

@@ -374,13 +374,13 @@ public class KryoSerializerTest {
 
     @Test
     public void testResourcePath() {
-        testSerializedEquals(ResourcePath.discrete(LinkKey.linkKey(CP1, CP2), VLAN1));
+        testSerializedEquals(ResourcePath.discrete(DID1, P1, VLAN1));
     }
 
     @Test
     public void testResourceAllocation() {
         testSerializedEquals(new org.onosproject.net.newresource.ResourceAllocation(
-                ResourcePath.discrete(LinkKey.linkKey(CP1, CP2), VLAN1),
+                ResourcePath.discrete(DID1, P1, VLAN1),
                 IntentId.valueOf(30)));
     }