diff options
Diffstat (limited to 'framework/src/onos/cli/src/main/java/org/onosproject/cli')
4 files changed, 55 insertions, 14 deletions
diff --git a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java index ee6d31b8..2b25744b 100644 --- a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java +++ b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/GroupsListCommand.java @@ -119,7 +119,7 @@ public class GroupsListCommand extends AbstractShellCommand { } private void printGroups(DeviceId deviceId, List<Group> groups) { - print("deviceId=%s", deviceId); + print("deviceId=%s, groupCount=%s", deviceId, groups.size()); for (Group group : groups) { print(FORMAT, Integer.toHexString(group.id().id()), group.state(), group.type(), group.bytes(), group.packets(), group.appId().name()); diff --git a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java index 4fd9b0df..ae4e410c 100644 --- a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java +++ b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java @@ -17,6 +17,7 @@ package org.onosproject.cli.net; import com.google.common.collect.Sets; +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.MacAddress; @@ -36,11 +37,15 @@ import java.util.Set; description = "Adds a new configured interface") public class InterfaceAddCommand extends AbstractShellCommand { - @Option(name = "-c", aliases = "--connectPoint", + @Argument(index = 0, name = "port", description = "Device port that the interface is associated with", required = true, multiValued = false) private String connectPoint = null; + @Argument(index = 1, name = "name", description = "Interface name", + required = true, multiValued = false) + private String name = null; + @Option(name = "-m", aliases = "--mac", description = "MAC address of the interface", required = false, multiValued = false) @@ -72,10 +77,13 @@ public class InterfaceAddCommand extends AbstractShellCommand { VlanId vlanId = vlan == null ? VlanId.NONE : VlanId.vlanId(Short.parseShort(vlan)); - Interface intf = new Interface(ConnectPoint.deviceConnectPoint(connectPoint), + Interface intf = new Interface(name, + ConnectPoint.deviceConnectPoint(connectPoint), ipAddresses, macAddr, vlanId); interfaceService.add(intf); + + print("Interface added"); } } diff --git a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceRemoveCommand.java b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceRemoveCommand.java index 941a65db..0a7b5a16 100644 --- a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceRemoveCommand.java +++ b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceRemoveCommand.java @@ -18,7 +18,6 @@ package org.onosproject.cli.net; import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.commands.Command; -import org.onlab.packet.VlanId; import org.onosproject.cli.AbstractShellCommand; import org.onosproject.incubator.net.intf.InterfaceAdminService; import org.onosproject.net.ConnectPoint; @@ -35,17 +34,23 @@ public class InterfaceRemoveCommand extends AbstractShellCommand { required = true, multiValued = false) private String connectPoint = null; - @Argument(index = 1, name = "vlan", - description = "Interface vlan", + @Argument(index = 1, name = "name", + description = "Interface name", required = true, multiValued = false) - private String vlan = null; + private String name = null; @Override protected void execute() { InterfaceAdminService interfaceService = get(InterfaceAdminService.class); - interfaceService.remove(ConnectPoint.deviceConnectPoint(connectPoint), - VlanId.vlanId(Short.parseShort(vlan))); + boolean success = interfaceService.remove( + ConnectPoint.deviceConnectPoint(connectPoint), name); + + if (success) { + print("Interface removed"); + } else { + print("Unable to remove interface"); + } } } diff --git a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfacesListCommand.java b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfacesListCommand.java index aa93eb94..fb3e68c2 100644 --- a/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfacesListCommand.java +++ b/framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfacesListCommand.java @@ -17,6 +17,8 @@ package org.onosproject.cli.net; import com.google.common.collect.Lists; import org.apache.karaf.shell.commands.Command; +import org.onlab.packet.MacAddress; +import org.onlab.packet.VlanId; import org.onosproject.cli.AbstractShellCommand; import org.onosproject.cli.Comparators; import org.onosproject.incubator.net.intf.Interface; @@ -32,8 +34,12 @@ import java.util.List; description = "Lists all configured interfaces.") public class InterfacesListCommand extends AbstractShellCommand { - private static final String FORMAT = - "port=%s/%s, ips=%s, mac=%s, vlan=%s"; + private static final String FORMAT = "%s: port=%s/%s"; + private static final String IP_FORMAT = " ips="; + private static final String MAC_FORMAT = " mac="; + private static final String VLAN_FORMAT = " vlan="; + + private static final String NO_NAME = "(unamed)"; @Override protected void execute() { @@ -43,10 +49,32 @@ public class InterfacesListCommand extends AbstractShellCommand { Collections.sort(interfaces, Comparators.INTERFACES_COMPARATOR); - for (Interface intf : interfaces) { - print(FORMAT, intf.connectPoint().deviceId(), intf.connectPoint().port(), - intf.ipAddresses(), intf.mac(), intf.vlan()); + interfaces.forEach(this::printInterface); + } + + private void printInterface(Interface intf) { + StringBuilder formatStringBuilder = new StringBuilder(FORMAT); + + if (!intf.ipAddresses().isEmpty()) { + formatStringBuilder.append(IP_FORMAT); + formatStringBuilder.append(intf.ipAddresses().toString()); + } + + if (!intf.mac().equals(MacAddress.NONE)) { + formatStringBuilder.append(MAC_FORMAT); + formatStringBuilder.append(intf.mac().toString()); + } + + if (!intf.vlan().equals(VlanId.NONE)) { + formatStringBuilder.append(VLAN_FORMAT); + formatStringBuilder.append(intf.vlan().toString()); } + + String name = (intf.name().equals(Interface.NO_INTERFACE_NAME)) ? + NO_NAME : intf.name(); + + print(formatStringBuilder.toString(), name, intf.connectPoint().deviceId(), + intf.connectPoint().port()); } } |