Add P2PIntent CLI fix

Easier bugfix part of ONOS-5183

- "-p" used by multiple options
- fix completer definition

Change-Id: I1cb97b93ad9143c7a025813628077e5a6cde2bc5

@@ -46,7 +46,8 @@ public class AddPointToPointIntentCommand extends ConnectivityIntentCommand {
               required = true, multiValued = false)
               required = true, multiValued = false)
     String egressDeviceString = null;
     String egressDeviceString = null;
 
 
-    @Option(name = "-p", aliases = "--protect",
+    // -p already defined in ConnectivityIntentCommand
+    @Option(name = "-r", aliases = "--protect",
             description = "Utilize path protection",
             description = "Utilize path protection",
             required = false, multiValued = false)
             required = false, multiValued = false)
     private boolean backup = false;
     private boolean backup = false;

@@ -280,6 +280,7 @@
             <completers>
             <completers>
                 <ref component-id="connectPointCompleter"/>
                 <ref component-id="connectPointCompleter"/>
                 <ref component-id="connectPointCompleter"/>
                 <ref component-id="connectPointCompleter"/>
+                <null/> <!-- no more argument -->
             </completers>
             </completers>
             <optional-completers>
             <optional-completers>
                 <entry key="-t" value-ref="ethTypeCompleter"/>
                 <entry key="-t" value-ref="ethTypeCompleter"/>
@@ -289,6 +290,7 @@
                 <entry key="--extHdr" value-ref="ExtHeaderCompleter"/>
                 <entry key="--extHdr" value-ref="ExtHeaderCompleter"/>
                 <entry key="-a" value-ref="allAppNameCompleter"/>
                 <entry key="-a" value-ref="allAppNameCompleter"/>
                 <entry key="-e" value-ref="encapTypeCompleter"/>
                 <entry key="-e" value-ref="encapTypeCompleter"/>
+                <entry key="-r" value-ref="nullCompleter"/> <!-- option has no argument -->
             </optional-completers>
             </optional-completers>
         </command>
         </command>
         <command>
         <command>