홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Pavlin Radoslavov
aab51a3c 1 parent d596b385

Added missing CLI output of HostToHostIntent-specific info 

for the "intents" CLI command.

Change-Id: Icb150b570e8b4c0a52186489d408842d4327b387
Inline Side-by-side
Showing 2 changed files with 31 additions and 5 deletions
......@@ -26,6 +26,7 @@ import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Link;
import org.onosproject.net.NetworkResource;
import org.onosproject.net.intent.ConnectivityIntent;
import org.onosproject.net.intent.HostToHostIntent;
import org.onosproject.net.intent.Intent;
import org.onosproject.net.intent.IntentService;
import org.onosproject.net.intent.IntentState;
......@@ -92,6 +93,7 @@ public class IntentsListCommand extends AbstractShellCommand {
private class IntentSummaries {
private IntentSummary summaryAll;
private IntentSummary summaryConnectivity;
private IntentSummary summaryHostToHost;
private IntentSummary summaryPointToPoint;
private IntentSummary summaryMultiPointToSinglePoint;
private IntentSummary summarySinglePointToMultiPoint;
......@@ -105,6 +107,7 @@ public class IntentsListCommand extends AbstractShellCommand {
private void init() {
summaryAll = new IntentSummary("All");
summaryConnectivity = new IntentSummary("Connectivity");
summaryHostToHost = new IntentSummary("HostToHost");
summaryPointToPoint = new IntentSummary("PointToPoint");
summaryMultiPointToSinglePoint =
new IntentSummary("MultiPointToSinglePoint");
......@@ -140,6 +143,10 @@ public class IntentsListCommand extends AbstractShellCommand {
// NOTE: ConnectivityIntent is a base type Intent
// continue;
}
if (intent instanceof HostToHostIntent) {
summaryHostToHost.update(intentState);
continue;
}
if (intent instanceof PointToPointIntent) {
summaryPointToPoint.update(intentState);
continue;
......@@ -174,6 +181,7 @@ public class IntentsListCommand extends AbstractShellCommand {
ObjectMapper mapper = new ObjectMapper();
ObjectNode result = mapper.createObjectNode();
result.put("connectivity", summaryConnectivity.json(mapper));
result.put("hostToHost", summaryHostToHost.json(mapper));
result.put("pointToPoint", summaryPointToPoint.json(mapper));
result.put("multiPointToSinglePoint",
summaryMultiPointToSinglePoint.json(mapper));
......@@ -191,6 +199,7 @@ public class IntentsListCommand extends AbstractShellCommand {
*/
private void printSummary() {
summaryConnectivity.printState();
summaryHostToHost.printState();
summaryPointToPoint.printState();
summaryMultiPointToSinglePoint.printState();
summarySinglePointToMultiPoint.printState();
......@@ -335,7 +344,10 @@ public class IntentsListCommand extends AbstractShellCommand {
}
}
if (intent instanceof PointToPointIntent) {
if (intent instanceof HostToHostIntent) {
HostToHostIntent pi = (HostToHostIntent) intent;
print(" host1=%s, host2=%s", pi.one(), pi.two());
} else if (intent instanceof PointToPointIntent) {
PointToPointIntent pi = (PointToPointIntent) intent;
print(" ingress=%s, egress=%s", pi.ingressPoint(), pi.egressPoint());
} else if (intent instanceof MultiPointToSinglePointIntent) {
......@@ -405,22 +417,22 @@ public class IntentsListCommand extends AbstractShellCommand {
pnode.add(link.toString());
}
result.set("path", pnode);
} else if (intent instanceof HostToHostIntent) {
HostToHostIntent pi = (HostToHostIntent) intent;
result.set("host1", LinksListCommand.json(mapper, pi.one()));
result.set("host2", LinksListCommand.json(mapper, pi.two()));
} else if (intent instanceof PointToPointIntent) {
PointToPointIntent pi = (PointToPointIntent) intent;
result.set("ingress", LinksListCommand.json(mapper, pi.ingressPoint()));
result.set("egress", LinksListCommand.json(mapper, pi.egressPoint()));
} else if (intent instanceof MultiPointToSinglePointIntent) {
MultiPointToSinglePointIntent pi = (MultiPointToSinglePointIntent) intent;
result.set("ingress", json(mapper, pi.ingressPoints()));
result.set("egress", LinksListCommand.json(mapper, pi.egressPoint()));
} else if (intent instanceof SinglePointToMultiPointIntent) {
SinglePointToMultiPointIntent pi = (SinglePointToMultiPointIntent) intent;
result.set("ingress", LinksListCommand.json(mapper, pi.ingressPoint()));
result.set("egress", json(mapper, pi.egressPoints()));
} else if (intent instanceof LinkCollectionIntent) {
LinkCollectionIntent li = (LinkCollectionIntent) intent;
result.set("links", LinksListCommand.json(li.links()));
......
......@@ -23,6 +23,7 @@ import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.HostId;
import org.onosproject.net.Link;
import org.onosproject.net.link.LinkService;
......@@ -89,6 +90,19 @@ public class LinksListCommand extends AbstractShellCommand {
}
/**
* Produces a JSON object for the specified host ID.
*
* @param mapper object mapper
* @param hostId host ID to encode
* @return JSON object
*/
public static ObjectNode json(ObjectMapper mapper, HostId hostId) {
return mapper.createObjectNode()
.put("mac", hostId.mac().toString())
.put("vlanId", hostId.vlanId().toString());
}
/**
* Produces a JSON object for the specified connect point.
*
* @param mapper object mapper
......