1. fix javadoc mistakes
2. add path state proverty to tunnel
3. fix bugs in tunnel creation and query commands.
Change-Id: I69b992e47630effe45764c887864d59d3a1eb870
diff --git a/cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java b/cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java
index eb20b95..1bb8afe 100644
--- a/cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java
@@ -72,7 +72,7 @@
@Option(name = "-b", aliases = "--bandwidth",
description = "The bandwidth attribute of tunnel", required = false, multiValued = false)
- String bandwidth = null;
+ String bandwidth = "1024";
private static final String FMT = "The tunnel identity is %s";
@@ -181,7 +181,7 @@
SparseAnnotations annotations = DefaultAnnotations
.builder()
- .set("bandwidth", bandwidth == null && "".equals(bandwidth) ? "0" : bandwidth)
+ .set("bandwidth", bandwidth == null || "".equals(bandwidth) ? "0" : bandwidth)
.build();
TunnelDescription tunnel = new DefaultTunnelDescription(
null,
@@ -197,6 +197,10 @@
null,
annotations);
TunnelId tunnelId = service.tunnelAdded(tunnel);
+ if (tunnelId == null) {
+ error("Create tunnel failed.");
+ return;
+ }
print(FMT, tunnelId.id());
}
diff --git a/cli/src/main/java/org/onosproject/cli/net/TunnelQueryCommand.java b/cli/src/main/java/org/onosproject/cli/net/TunnelQueryCommand.java
index e1bf52a..6a4da17 100644
--- a/cli/src/main/java/org/onosproject/cli/net/TunnelQueryCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/TunnelQueryCommand.java
@@ -205,7 +205,7 @@
private String showPath(Path path) {
if (path == null) {
- return "";
+ return "null";
}
StringBuilder builder = new StringBuilder("(");
for (Link link : path.links()) {