Add P2PIntent CLI fix
Easier bugfix part of ONOS-5183
- "-p" used by multiple options
- fix completer definition
Change-Id: I1cb97b93ad9143c7a025813628077e5a6cde2bc5
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java
index 14db547..294b75e 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java
@@ -46,7 +46,8 @@
required = true, multiValued = false)
String egressDeviceString = null;
- @Option(name = "-p", aliases = "--protect",
+ // -p already defined in ConnectivityIntentCommand
+ @Option(name = "-r", aliases = "--protect",
description = "Utilize path protection",
required = false, multiValued = false)
private boolean backup = false;
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 0343d6c..4fbae87 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -280,6 +280,7 @@
<completers>
<ref component-id="connectPointCompleter"/>
<ref component-id="connectPointCompleter"/>
+ <null/> <!-- no more argument -->
</completers>
<optional-completers>
<entry key="-t" value-ref="ethTypeCompleter"/>
@@ -289,6 +290,7 @@
<entry key="--extHdr" value-ref="ExtHeaderCompleter"/>
<entry key="-a" value-ref="allAppNameCompleter"/>
<entry key="-e" value-ref="encapTypeCompleter"/>
+ <entry key="-r" value-ref="nullCompleter"/> <!-- option has no argument -->
</optional-completers>
</command>
<command>