Adding a very simple output for pingall
Change-Id: I7575d4f6d1c45cdfaeb6a10d1bdc8371bcb25a29
(cherry picked from commit 134c3c051f1d8bdbaee66c4ffee7579e53ffc1f0)
diff --git a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java
new file mode 100644
index 0000000..f8648d0
--- /dev/null
+++ b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.t3.cli;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Option;
+import org.onlab.packet.IpAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.Host;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.criteria.IPCriterion;
+import org.onosproject.t3.api.StaticPacketTrace;
+import org.onosproject.t3.api.TroubleshootService;
+import org.onosproject.t3.impl.Generator;
+
+import java.util.Set;
+
+import static java.lang.Thread.sleep;
+import static org.onlab.packet.EthType.EtherType;
+
+/**
+ * Starts a Static Packet Trace for a given input and prints the result.
+ */
+@Command(scope = "onos", name = "t3-troubleshoot-pingall",
+ description = "Traces a ping between all hosts in the system of a given ETH type")
+public class TroubleshootPingAllCommand extends AbstractShellCommand {
+
+ private static final String FMT_SHORT =
+ "id=%s, mac=%s, locations=%s, vlan=%s, ip(s)=%s";
+
+ @Option(name = "-et", aliases = "--ethType", description = "ETH Type", valueToShowInHelp = "ipv4")
+ String ethType = "ipv4";
+
+ @Option(name = "-v", aliases = "--verbose", description = "Outputs trace for each host to host combination")
+ private boolean verbosity1 = false;
+
+ @Option(name = "-vv", aliases = "--veryverbose", description = "Outputs details of every trace")
+ private boolean verbosity2 = false;
+
+ @Option(name = "-d", aliases = "--delay", description = "delay between host to host trace display")
+ private long delay = 0;
+
+ @Override
+ protected void execute() {
+ TroubleshootService service = get(TroubleshootService.class);
+
+ EtherType type = EtherType.valueOf(ethType.toUpperCase());
+
+ print("Tracing between all %s hosts", ethType);
+
+ if (!type.equals(EtherType.IPV4) && !type.equals(EtherType.IPV6)) {
+ print("Command only support IPv4 or IPv6");
+ } else {
+ //Create the generator for the list of traces.
+ Generator<Set<StaticPacketTrace>> generator = service.pingAllGenerator(type);
+ Host previousHost = null;
+ while (generator.iterator().hasNext()) {
+ Set<StaticPacketTrace> traces = generator.iterator().next();
+ for (StaticPacketTrace trace : traces) {
+ boolean ipv4 = type.equals(EtherType.IPV4);
+ //no verbosity is mininet style output
+ if (!verbosity1 && !verbosity2) {
+ if (trace.getEndpointHosts().isPresent()) {
+ Host src = trace.getEndpointHosts().get().getLeft();
+ if (previousHost == null || !previousHost.equals(src)) {
+ print("%s", StringUtils.rightPad("", 125, '-'));
+ IpAddress ipAddress = getIpAddress(trace, ipv4, src, true);
+ if (ipAddress == null) {
+ print("%s", src.id() + " -->");
+ } else {
+ print("%s (%s) -->", src.id(), ipAddress);
+ }
+ previousHost = src;
+ } else {
+ String host;
+ IpAddress ipAddress = getIpAddress(trace, ipv4, src, false);
+ if (ipAddress == null) {
+ host = String.format(" %s %s", trace.getEndpointHosts().get().getRight().id(),
+ trace.isSuccess());
+ } else {
+ host = String.format(" %s (%s) %s",
+ trace.getEndpointHosts().get().getRight().id(), ipAddress,
+ trace.isSuccess());
+ }
+ if (!trace.isSuccess()) {
+ host = host + " " + trace.resultMessage();
+ }
+ print("%s", host);
+ }
+ }
+ } else {
+ print("%s", StringUtils.leftPad("", 125, '-'));
+
+ if (trace.getInitialPacket() != null) {
+ if (verbosity1) {
+ printResultOnly(trace, ipv4);
+ } else if (verbosity2) {
+ printVerbose(trace);
+ }
+ } else {
+ if (trace.getEndpointHosts().isPresent()) {
+ Host source = trace.getEndpointHosts().get().getLeft();
+ Host destination = trace.getEndpointHosts().get().getRight();
+ print("Source %s --> Destination %s", source.id(), destination.id());
+ }
+ print("Error in obtaining trace: %s", trace.resultMessage());
+ }
+ }
+ }
+ try {
+ sleep(delay);
+ } catch (InterruptedException e) {
+ log.debug("interrupted while sleep");
+ }
+ }
+ print("%s", StringUtils.rightPad("", 125, '-'));
+ }
+ }
+
+ private IpAddress getIpAddress(StaticPacketTrace trace, boolean ipv4, Host host, boolean src) {
+ IpAddress ipAddress;
+ if (ipv4) {
+ Criterion.Type type = src ? Criterion.Type.IPV4_SRC : Criterion.Type.IPV4_DST;
+ if (trace.getInitialPacket().getCriterion(type) != null) {
+ ipAddress = ((IPCriterion) trace.getInitialPacket()
+ .getCriterion(type)).ip().address();
+ } else {
+ ipAddress = host.ipAddresses().stream().filter(IpAddress::isIp4)
+ .findAny().orElseGet(null);
+ }
+ } else {
+ Criterion.Type type = src ? Criterion.Type.IPV6_SRC : Criterion.Type.IPV6_DST;
+ if (trace.getInitialPacket().getCriterion(type) != null) {
+ ipAddress = ((IPCriterion) trace.getInitialPacket()
+ .getCriterion(type)).ip().address();
+ } else {
+ ipAddress = host.ipAddresses().stream().filter(IpAddress::isIp6)
+ .findAny().orElseGet(null);
+ }
+ }
+ return ipAddress;
+ }
+
+ private void printResultOnly(StaticPacketTrace trace, boolean ipv4) {
+ if (trace.getEndpointHosts().isPresent()) {
+ Host source = trace.getEndpointHosts().get().getLeft();
+ Host destination = trace.getEndpointHosts().get().getRight();
+ IpAddress srcIP;
+ IpAddress dstIP;
+ if (ipv4 && trace.getInitialPacket().getCriterion(Criterion.Type.IPV4_SRC) != null) {
+ srcIP = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV4_SRC)).ip().address();
+ dstIP = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV4_DST)).ip().address();
+ print("Source %s (%s) --> Destination %s (%s)", source.id(), srcIP, destination.id(), dstIP);
+ } else if (trace.getInitialPacket().getCriterion(Criterion.Type.IPV6_SRC) != null) {
+ srcIP = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV6_SRC)).ip().address();
+ dstIP = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV6_DST)).ip().address();
+ print("Source %s (%s) --> Destination %s (%s)", source.id(), srcIP, destination.id(), dstIP);
+ } else {
+ print("Source %s --> Destination %s", source.id(), destination.id());
+ }
+ print("%s", trace.resultMessage());
+ } else {
+ print("Can't gather host information from trace");
+ print("%s", trace.resultMessage());
+ }
+ }
+
+ private void printVerbose(StaticPacketTrace trace) {
+ if (trace.getEndpointHosts().isPresent()) {
+ Host source = trace.getEndpointHosts().get().getLeft();
+ print("Source host %s", printHost(source));
+ Host destination = trace.getEndpointHosts().get().getRight();
+ print("Destination host %s", printHost(destination));
+ }
+ print("%s", trace.getInitialPacket());
+ print("%s", T3CliUtils.printTrace(trace, false, false));
+ }
+
+ private String printHost(Host host) {
+ return String.format(FMT_SHORT, host.id(), host.mac(),
+ host.locations(),
+ host.vlan(), host.ipAddresses());
+ }
+}
diff --git a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllTraceCommand.java b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllTraceCommand.java
deleted file mode 100644
index d2dba49..0000000
--- a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllTraceCommand.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2018-present Open Networking Foundation
- *
- * 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.t3.cli;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.commands.Option;
-import org.onlab.packet.IpAddress;
-import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.net.Host;
-import org.onosproject.net.flow.criteria.Criterion;
-import org.onosproject.net.flow.criteria.IPCriterion;
-import org.onosproject.t3.api.StaticPacketTrace;
-import org.onosproject.t3.api.TroubleshootService;
-
-import java.util.List;
-
-import static org.onlab.packet.EthType.EtherType;
-
-/**
- * Starts a Static Packet Trace for a given input and prints the result.
- */
-@Command(scope = "onos", name = "t3-troubleshoot-pingall",
- description = "Traces a ping between all hosts in the system of a given ETH type")
-public class TroubleshootPingAllTraceCommand extends AbstractShellCommand {
-
- private static final String FMT_SHORT =
- "id=%s, mac=%s, locations=%s, vlan=%s, ip(s)=%s";
-
- @Option(name = "-et", aliases = "--ethType", description = "ETH Type", valueToShowInHelp = "ipv4")
- String ethType = "ipv4";
-
- @Option(name = "-v", aliases = "--verbose", description = "Outputs trace for each host to host combination")
- private boolean verbosity1 = false;
-
- @Override
- protected void execute() {
- TroubleshootService service = get(TroubleshootService.class);
-
- EtherType type = EtherType.valueOf(ethType.toUpperCase());
-
- print("Tracing between all %s hosts", ethType);
-
- if (!type.equals(EtherType.IPV4) && !type.equals(EtherType.IPV6)) {
- print("Command only support IPv4 or IPv6");
- } else {
- print("%s", StringUtils.leftPad("", 100, '-'));
- //Obtain the list of traces
- List<StaticPacketTrace> traces = service.pingAll(type);
-
- if (traces.size() == 0) {
- print("No traces were obtained, please check system configuration");
- }
- boolean ipv4 = type.equals(EtherType.IPV4);
- traces.forEach(trace -> {
- if (trace.getInitialPacket() != null) {
- if (verbosity1) {
- printVerbose(trace);
- } else {
- printResultOnly(trace, ipv4);
- }
- } else {
- if (trace.getEndpointHosts().isPresent()) {
- Host source = trace.getEndpointHosts().get().getLeft();
- Host destination = trace.getEndpointHosts().get().getRight();
- print("Source %s --> Destination %s", source.id(), destination.id());
- }
- print("Error in obtaining trace: %s", trace.resultMessage());
- }
- print("%s", StringUtils.leftPad("", 100, '-'));
- });
- }
-
-
- }
-
- private void printResultOnly(StaticPacketTrace trace, boolean ipv4) {
- if (trace.getEndpointHosts().isPresent()) {
- Host source = trace.getEndpointHosts().get().getLeft();
- Host destination = trace.getEndpointHosts().get().getRight();
- IpAddress srcIP;
- IpAddress dstIP;
- if (ipv4 && trace.getInitialPacket().getCriterion(Criterion.Type.IPV4_SRC) != null) {
- srcIP = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV4_SRC)).ip().address();
- dstIP = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV4_DST)).ip().address();
- print("Source %s (%s) --> Destination %s (%s)", source.id(), srcIP, destination.id(), dstIP);
- } else if (trace.getInitialPacket().getCriterion(Criterion.Type.IPV6_SRC) != null) {
- srcIP = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV6_SRC)).ip().address();
- dstIP = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV6_DST)).ip().address();
- print("Source %s (%s) --> Destination %s (%s)", source.id(), srcIP, destination.id(), dstIP);
- } else {
- print("Source %s --> Destination %s", source.id(), destination.id());
- }
- print("%s", trace.resultMessage());
- } else {
- print("Can't gather host information from trace");
- print("%s", trace.resultMessage());
- }
- }
-
- private void printVerbose(StaticPacketTrace trace) {
- if (trace.getEndpointHosts().isPresent()) {
- Host source = trace.getEndpointHosts().get().getLeft();
- print("Source host %s", printHost(source));
- Host destination = trace.getEndpointHosts().get().getRight();
- print("Destination host %s", printHost(destination));
- }
- print("%s", trace.getInitialPacket());
- print("%s", T3CliUtils.printTrace(trace, false, false));
- }
-
- private String printHost(Host host) {
- return String.format(FMT_SHORT, host.id(), host.mac(),
- host.locations(),
- host.vlan(), host.ipAddresses());
- }
-}