ONOS-1597 - add an optional appId to CLI commands that create intents

Change-Id: Iaf14f1a98f617eb025dab1b16542d68184082ceb

ONOS-1597 - add an optional appId to CLI commands that create intents
Change-Id: Iaf14f1a98f617eb025dab1b16542d68184082ceb
Ray Milkey · Gerrit Code Review
Commit 95c5087688d0c9d365d6a7a25822e4c89c03d9e2 95c50876 1 parent c9e16bfa
Showing 3 changed files with 87 additions and 0 deletions
cli/src/main/java/org/onosproject/cli/app/AllApplicationNamesCompleter.java
cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
--- a/cli/src/main/java/org/onosproject/cli/app/AllApplicationNamesCompleter.java 0 → 100644
View file @95c5087
+++ b/cli/src/main/java/org/onosproject/cli/app/AllApplicationNamesCompleter.java 0 → 100644
View file @95c5087
+/*
+ * 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.app;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.StreamSupport;
+
+import org.onosproject.app.ApplicationService;
+import org.onosproject.cli.AbstractChoicesCompleter;
+import org.onosproject.core.Application;
+
+import static java.util.stream.Collectors.toList;
+import static org.onosproject.app.ApplicationState.INSTALLED;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
+/**
+ * All installed application name completer.
+ */
+public class AllApplicationNamesCompleter extends AbstractChoicesCompleter {
+    @Override
+    public List<String> choices() {
+
+        // Fetch the service and return the list of app names
+        ApplicationService service = get(ApplicationService.class);
+        Iterator<Application> it = service.getApplications().iterator();
+
+        // Filter the list of apps, selecting only the installed ones.
+        // Add each app name to the list of choices.
+        return
+            StreamSupport.stream(
+                Spliterators.spliteratorUnknownSize(it, Spliterator.ORDERED), false)
+                    .filter(app -> service.getState(app.id()) == INSTALLED)
+                    .map(app -> app.id().name())
+                    .collect(toList());
+
+    }
+
+}
--- a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
View file @95c5087
+++ b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
View file @95c5087
@@ -23,6 +23,8 @@ import java.util.List;
 import org.apache.karaf.shell.commands.Option;
 import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
 import org.onosproject.net.Link;
 import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -84,6 +86,10 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand {
             required = false, multiValued = false)
     private boolean lambda = false;
+    @Option(name = "-a", aliases = "--appId", description = "Application Id",
+            required = false, multiValued = false)
+    private String appId = null;
+
     @Option(name = "-k", aliases = "--key", description = "Intent Key",
             required = false, multiValued = false)
     private String intentKey = null;
@@ -229,6 +235,18 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand {
         return constraints;
     }
+    @Override
+    protected ApplicationId appId() {
+        ApplicationId appIdForIntent;
+        if (appId == null) {
+            appIdForIntent = super.appId();
+        } else {
+            CoreService service = get(CoreService.class);
+            appIdForIntent = service.getAppId(appId);
+        }
+        return appIdForIntent;
+    }
+
     /**
      * Creates a key for an intent based on command line arguments.  If a key
      * has been specified, it is returned.  If no key is specified, null
@@ -238,6 +256,8 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand {
      */
     protected Key key() {
         Key key = null;
+        ApplicationId appIdForIntent;
+
         if (intentKey != null) {
             key = Key.of(intentKey, appId());
         }
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
View file @95c5087
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
View file @95c5087
@@ -151,6 +151,9 @@
                 <ref component-id="hostIdCompleter"/>
                 <null/>
             </completers>
+            <optional-completers>
+                <entry key="-a" value-ref="allAppNameCompleter"/>
+            </optional-completers>
         </command>
         <command>
             <action class="org.onosproject.cli.net.AddPointToPointIntentCommand"/>
@@ -162,6 +165,7 @@
             <optional-completers>
                 <entry key="-t" value-ref="ethTypeCompleter"/>
                 <entry key="--ipProto" value-ref="ipProtocolCompleter"/>
+                <entry key="-a" value-ref="allAppNameCompleter"/>
             </optional-completers>
         </command>
         <command>
@@ -171,6 +175,9 @@
                 <ref component-id="connectPointCompleter"/>
                 <null/>
             </completers>
+            <optional-completers>
+                <entry key="-a" value-ref="allAppNameCompleter"/>
+            </optional-completers>
         </command>
         <command>
             <action class="org.onosproject.cli.net.GetStatistics"/>
@@ -186,6 +193,7 @@
             <optional-completers>
                 <entry key="-t" value-ref="ethTypeCompleter"/>
                 <entry key="--ipProto" value-ref="ipProtocolCompleter"/>
+                <entry key="-a" value-ref="allAppNameCompleter"/>
             </optional-completers>
         </command>
         <command>
@@ -196,6 +204,7 @@
             <optional-completers>
                 <entry key="-t" value-ref="ethTypeCompleter"/>
                 <entry key="--ipProto" value-ref="ipProtocolCompleter"/>
+                <entry key="-a" value-ref="allAppNameCompleter"/>
             </optional-completers>
         </command>
         <command>
@@ -317,11 +326,15 @@
                 <ref component-id="connectPointCompleter"/>
                 <null/>
             </completers>
+            <optional-completers>
+                <entry key="-a" value-ref="allAppNameCompleter"/>
+            </optional-completers>
         </command>
     </command-bundle>
     <bean id="appCommandCompleter" class="org.onosproject.cli.app.ApplicationCommandCompleter"/>
     <bean id="appNameCompleter" class="org.onosproject.cli.app.ApplicationNameCompleter"/>
+    <bean id="allAppNameCompleter" class="org.onosproject.cli.app.AllApplicationNamesCompleter"/>
     <bean id="appIdWithIntentNameCompleter" class="org.onosproject.cli.app.ApplicationIdWithIntentNameCompleter"/>
     <bean id="cfgCommandCompleter" class="org.onosproject.cli.cfg.ComponentConfigCommandCompleter"/>
     <bean id="componentNameCompleter" class="org.onosproject.cli.cfg.ComponentNameCompleter"/>