Enhancing STC and cleaning up various test topos.
Change-Id: I7f5b349835ebf3d7da824be0aa2cddd860631f84
diff --git a/cli/src/main/java/org/onosproject/cli/UiViewListCommand.java b/cli/src/main/java/org/onosproject/cli/UiViewListCommand.java
new file mode 100644
index 0000000..33a85e6
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/UiViewListCommand.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * 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.cli;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.ui.UiExtension;
+import org.onosproject.ui.UiExtensionService;
+
+import java.util.List;
+
+/**
+ * Lists all UI views.
+ */
+@Command(scope = "onos", name = "ui-views",
+ description = "Lists all UI views")
+public class UiViewListCommand extends AbstractShellCommand {
+
+ private static final String FMT = "id=%s, category=%s, label=%s, icon=%s";
+
+ @Override
+ protected void execute() {
+ UiExtensionService service = get(UiExtensionService.class);
+ if (outputJson()) {
+ print("%s", json(service.getExtensions()));
+ } else {
+ service.getExtensions().forEach(ext -> ext.views()
+ .forEach(v -> print(FMT, v.id(), v.category().label(),
+ v.label(), v.iconId())));
+ }
+ }
+
+ private JsonNode json(List<UiExtension> extensions) {
+ ObjectMapper mapper = new ObjectMapper();
+ ArrayNode node = mapper.createArrayNode();
+ extensions.forEach(ext -> ext.views()
+ .forEach(v -> node.add(mapper.createObjectNode()
+ .put("id", v.id())
+ .put("category", v.category().label())
+ .put("label", v.label())
+ .put("icon", v.iconId()))));
+ return node;
+ }
+
+}
diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 9a4ffa8..e2f0764 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -59,6 +59,10 @@
</command>
<command>
+ <action class="org.onosproject.cli.UiViewListCommand"/>
+ </command>
+
+ <command>
<action class="org.onosproject.cli.RolesCommand"/>
</command>
<command>