Added completer for interface names
Change-Id: Id76efe63f11c6f3fb2d307fedb00c9700418c59f
diff --git a/cli/src/main/java/org/onosproject/cli/net/completer/InterfaceNameCompleter.java b/cli/src/main/java/org/onosproject/cli/net/completer/InterfaceNameCompleter.java
new file mode 100644
index 0000000..e080c9b
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/completer/InterfaceNameCompleter.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2017-present 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.net.completer;
+
+import org.onosproject.cli.AbstractChoicesCompleter;
+import org.onosproject.incubator.net.intf.Interface;
+import org.onosproject.incubator.net.intf.InterfaceService;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.onlab.osgi.DefaultServiceDirectory.getService;
+
+/**
+ * Completer for interface names.
+ */
+public class InterfaceNameCompleter extends AbstractChoicesCompleter {
+
+ @Override
+ protected List<String> choices() {
+ InterfaceService interfaceService = getService(InterfaceService.class);
+
+ return interfaceService.getInterfaces().stream()
+ .map(Interface::name)
+ .filter(name -> !name.equals(Interface.NO_INTERFACE_NAME))
+ .collect(Collectors.toList());
+ }
+
+}
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 949b1e3..1d53f47 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -474,7 +474,8 @@
<action class="org.onosproject.cli.net.InterfaceRemoveCommand"/>
<completers>
<ref component-id="connectPointCompleter"/>
- <ref component-id="placeholderCompleter" />
+ <ref component-id="interfaceNameCompleter"/>
+ <null/>
</completers>
</command>
<command>
@@ -809,4 +810,5 @@
<bean id="annotationKeysCompleter" class="org.onosproject.cli.net.completer.AnnotationKeysCompleter"/>
<bean id="peerConnectPointCompleter" class="org.onosproject.cli.net.completer.PeerConnectPointCompleter"/>
+ <bean id="interfaceNameCompleter" class="org.onosproject.cli.net.completer.InterfaceNameCompleter"/>
</blueprint>