diff --git a/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java b/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java
index 65416b2..42824ab 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java
@@ -19,18 +19,11 @@
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DeviceId;
 import org.onosproject.net.Link;
-import org.onosproject.net.PortNumber;
 import org.onosproject.net.link.LinkService;
 import org.onosproject.net.resource.LinkResourceService;
 import org.onosproject.net.resource.ResourceRequest;
 
-import static org.onosproject.cli.net.AddPointToPointIntentCommand.getDeviceId;
-import static org.onosproject.cli.net.AddPointToPointIntentCommand.getPortNumber;
-import static org.onosproject.net.DeviceId.deviceId;
-import static org.onosproject.net.PortNumber.portNumber;
-
 /**
  * Lists allocations by link.
  */
@@ -55,13 +48,9 @@
 
         Iterable<ResourceRequest> itr = null;
         try {
-            DeviceId ingressDeviceId = deviceId(getDeviceId(srcString));
-            PortNumber ingressPortNumber = portNumber(getPortNumber(srcString));
-            ConnectPoint src = new ConnectPoint(ingressDeviceId, ingressPortNumber);
+            ConnectPoint src = ConnectPoint.deviceConnectPoint(srcString);
 
-            DeviceId egressDeviceId = deviceId(getDeviceId(dstString));
-            PortNumber egressPortNumber = portNumber(getPortNumber(dstString));
-            ConnectPoint dst = new ConnectPoint(egressDeviceId, egressPortNumber);
+            ConnectPoint dst = ConnectPoint.deviceConnectPoint(dstString);
 
             Link link = linkService.getLink(src, dst);