Add static factory method to create ConnectPoints from strings.
Change-Id: I743b4a4fb433ad07cf6f2cbed3da7b6e19a74ebb
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddMplsIntent.java b/cli/src/main/java/org/onosproject/cli/net/AddMplsIntent.java
index 8396e9d..0983aff 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddMplsIntent.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddMplsIntent.java
@@ -1,23 +1,18 @@
package org.onosproject.cli.net;
-import java.util.List;
-import java.util.Optional;
-
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.onlab.packet.MplsLabel;
import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.intent.Constraint;
import org.onosproject.net.intent.IntentService;
import org.onosproject.net.intent.MplsIntent;
-import static org.onosproject.net.DeviceId.deviceId;
-import static org.onosproject.net.PortNumber.portNumber;
+import java.util.List;
+import java.util.Optional;
/**
* Installs MPLS intents.
@@ -53,19 +48,14 @@
protected void execute() {
IntentService service = get(IntentService.class);
- DeviceId ingressDeviceId = deviceId(getDeviceId(ingressDeviceString));
- PortNumber ingressPortNumber = portNumber(getPortNumber(ingressDeviceString));
- ConnectPoint ingress = new ConnectPoint(ingressDeviceId,
- ingressPortNumber);
+ ConnectPoint ingress = ConnectPoint.deviceConnectPoint(ingressDeviceString);
Optional<MplsLabel> ingressLabel = Optional.empty();
if (!ingressLabelString.isEmpty()) {
ingressLabel = Optional
.ofNullable(MplsLabel.mplsLabel(parseInt(ingressLabelString)));
}
- DeviceId egressDeviceId = deviceId(getDeviceId(egressDeviceString));
- PortNumber egressPortNumber = portNumber(getPortNumber(egressDeviceString));
- ConnectPoint egress = new ConnectPoint(egressDeviceId, egressPortNumber);
+ ConnectPoint egress = ConnectPoint.deviceConnectPoint(egressDeviceString);
Optional<MplsLabel> egressLabel = Optional.empty();
if (!ingressLabelString.isEmpty()) {
@@ -92,34 +82,6 @@
service.submit(intent);
}
- /**
- * Extracts the port number portion of the ConnectPoint.
- *
- * @param deviceString string representing the device/port
- * @return port number as a string, empty string if the port is not found
- */
- public static String getPortNumber(String deviceString) {
- int slash = deviceString.indexOf('/');
- if (slash <= 0) {
- return "";
- }
- return deviceString.substring(slash + 1, deviceString.length());
- }
-
- /**
- * Extracts the device ID portion of the ConnectPoint.
- *
- * @param deviceString string representing the device/port
- * @return device ID string
- */
- public static String getDeviceId(String deviceString) {
- int slash = deviceString.indexOf('/');
- if (slash <= 0) {
- return "";
- }
- return deviceString.substring(0, slash);
- }
-
protected Integer parseInt(String value) {
try {
return Integer.parseInt(value);