Committed by
Gerrit Code Review
Add P2PIntent CLI fix
Easier bugfix part of ONOS-5183 - "-p" used by multiple options - fix completer definition Change-Id: I1cb97b93ad9143c7a025813628077e5a6cde2bc5
Showing
2 changed files
with
4 additions
and
1 deletions
... | @@ -46,7 +46,8 @@ public class AddPointToPointIntentCommand extends ConnectivityIntentCommand { | ... | @@ -46,7 +46,8 @@ public class AddPointToPointIntentCommand extends ConnectivityIntentCommand { |
46 | required = true, multiValued = false) | 46 | required = true, multiValued = false) |
47 | String egressDeviceString = null; | 47 | String egressDeviceString = null; |
48 | 48 | ||
49 | - @Option(name = "-p", aliases = "--protect", | 49 | + // -p already defined in ConnectivityIntentCommand |
50 | + @Option(name = "-r", aliases = "--protect", | ||
50 | description = "Utilize path protection", | 51 | description = "Utilize path protection", |
51 | required = false, multiValued = false) | 52 | required = false, multiValued = false) |
52 | private boolean backup = false; | 53 | private boolean backup = false; | ... | ... |
... | @@ -280,6 +280,7 @@ | ... | @@ -280,6 +280,7 @@ |
280 | <completers> | 280 | <completers> |
281 | <ref component-id="connectPointCompleter"/> | 281 | <ref component-id="connectPointCompleter"/> |
282 | <ref component-id="connectPointCompleter"/> | 282 | <ref component-id="connectPointCompleter"/> |
283 | + <null/> <!-- no more argument --> | ||
283 | </completers> | 284 | </completers> |
284 | <optional-completers> | 285 | <optional-completers> |
285 | <entry key="-t" value-ref="ethTypeCompleter"/> | 286 | <entry key="-t" value-ref="ethTypeCompleter"/> |
... | @@ -289,6 +290,7 @@ | ... | @@ -289,6 +290,7 @@ |
289 | <entry key="--extHdr" value-ref="ExtHeaderCompleter"/> | 290 | <entry key="--extHdr" value-ref="ExtHeaderCompleter"/> |
290 | <entry key="-a" value-ref="allAppNameCompleter"/> | 291 | <entry key="-a" value-ref="allAppNameCompleter"/> |
291 | <entry key="-e" value-ref="encapTypeCompleter"/> | 292 | <entry key="-e" value-ref="encapTypeCompleter"/> |
293 | + <entry key="-r" value-ref="nullCompleter"/> <!-- option has no argument --> | ||
292 | </optional-completers> | 294 | </optional-completers> |
293 | </command> | 295 | </command> |
294 | <command> | 296 | <command> | ... | ... |
-
Please register or login to post a comment