Renamed PKCS #12 options for consistency.

The pki CLI's --pkcs12 options has been renamed to --pkcs12-file
for consistency with pki-server CLI options.

https://fedorahosted.org/pki/ticket/1742

6 files changed, 40 insertions, 40 deletions

diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py
index 2c735f0ef..2f0b5bdf0 100644
--- a/base/server/python/pki/server/__init__.py
+++ b/base/server/python/pki/server/__init__.py
@@ -188,7 +188,7 @@ class PKISubsystem(object):
 
             cmd.extend([
                 'pkcs12-cert-add',
-                '--pkcs12', pkcs12_file,
+                '--pkcs12-file', pkcs12_file,
                 '--pkcs12-password-file', pkcs12_password_file,
             ])
 
@@ -236,7 +236,7 @@ class PKISubsystem(object):
 
             cmd.extend([
                 'pkcs12-export',
-                '--pkcs12', pkcs12_file,
+                '--pkcs12-file', pkcs12_file,
                 '--pkcs12-password-file', pkcs12_password_file,
                 nickname
             ])
@@ -255,7 +255,7 @@ class PKISubsystem(object):
 
             cmd.extend([
                 'pkcs12-cert-del',
-                '--pkcs12', pkcs12_file,
+                '--pkcs12-file', pkcs12_file,
                 '--pkcs12-password-file', pkcs12_password_file,
                 nickname
             ])
diff --git a/base/server/python/pki/server/cli/ca.py b/base/server/python/pki/server/cli/ca.py
index fcc76fa25..fe8ce2bc3 100644
--- a/base/server/python/pki/server/cli/ca.py
+++ b/base/server/python/pki/server/cli/ca.py
@@ -69,12 +69,12 @@ class CACertChainExportCLI(pki.cli.CLI):
     def print_help(self):
         print('Usage: pki-server ca-cert-chain-export [OPTIONS]')
         print()
-        print('  -i, --instance <instance ID>    Instance ID (default: pki-tomcat).')
-        print('      --pkcs12-file               PKCS #12 file to store certificates and keys.')
-        print('      --pkcs12-password           Password for the PKCS #12 file.')
-        print('      --pkcs12-password-file      File containing the PKCS #12 password.')
-        print('  -v, --verbose                   Run in verbose mode.')
-        print('      --help                      Show help message.')
+        print('  -i, --instance <instance ID>       Instance ID (default: pki-tomcat).')
+        print('      --pkcs12-file <path>           PKCS #12 file to store certificates and keys.')
+        print('      --pkcs12-password <password>   Password for the PKCS #12 file.')
+        print('      --pkcs12-password-file <path>  File containing the PKCS #12 password.')
+        print('  -v, --verbose                      Run in verbose mode.')
+        print('      --help                         Show help message.')
         print()
 
     def execute(self, args):
@@ -324,12 +324,12 @@ class CAClonePrepareCLI(pki.cli.CLI):
     def print_help(self):
         print('Usage: pki-server ca-clone-prepare [OPTIONS]')
         print()
-        print('  -i, --instance <instance ID>    Instance ID (default: pki-tomcat).')
-        print('      --pkcs12-file               PKCS #12 file to store certificates and keys.')
-        print('      --pkcs12-password           Password for the PKCS #12 file.')
-        print('      --pkcs12-password-file      File containing the PKCS #12 password.')
-        print('  -v, --verbose                   Run in verbose mode.')
-        print('      --help                      Show help message.')
+        print('  -i, --instance <instance ID>       Instance ID (default: pki-tomcat).')
+        print('      --pkcs12-file <path>           PKCS #12 file to store certificates and keys.')
+        print('      --pkcs12-password <password>   Password for the PKCS #12 file.')
+        print('      --pkcs12-password-file <path>  File containing the PKCS #12 password.')
+        print('  -v, --verbose                      Run in verbose mode.')
+        print('      --help                         Show help message.')
         print()
 
     def execute(self, args):
diff --git a/base/server/python/pki/server/cli/kra.py b/base/server/python/pki/server/cli/kra.py
index c11fda6ab..7dfa680cf 100644
--- a/base/server/python/pki/server/cli/kra.py
+++ b/base/server/python/pki/server/cli/kra.py
@@ -57,12 +57,12 @@ class KRAClonePrepareCLI(pki.cli.CLI):
     def print_help(self):
         print('Usage: pki-server kra-clone-prepare [OPTIONS]')
         print()
-        print('  -i, --instance <instance ID>    Instance ID (default: pki-tomcat).')
-        print('      --pkcs12-file               PKCS #12 file to store certificates and keys.')
-        print('      --pkcs12-password           Password for the PKCS #12 file.')
-        print('      --pkcs12-password-file      File containing the PKCS #12 password.')
-        print('  -v, --verbose                   Run in verbose mode.')
-        print('      --help                      Show help message.')
+        print('  -i, --instance <instance ID>       Instance ID (default: pki-tomcat).')
+        print('      --pkcs12-file <path>           PKCS #12 file to store certificates and keys.')
+        print('      --pkcs12-password <password>   Password for the PKCS #12 file.')
+        print('      --pkcs12-password-file <path>  File containing the PKCS #12 password.')
+        print('  -v, --verbose                      Run in verbose mode.')
+        print('      --help                         Show help message.')
         print()
 
     def execute(self, args):
diff --git a/base/server/python/pki/server/cli/ocsp.py b/base/server/python/pki/server/cli/ocsp.py
index 88fff4330..b913a20c5 100644
--- a/base/server/python/pki/server/cli/ocsp.py
+++ b/base/server/python/pki/server/cli/ocsp.py
@@ -57,12 +57,12 @@ class OCSPClonePrepareCLI(pki.cli.CLI):
     def print_help(self):
         print('Usage: pki-server ocsp-clone-prepare [OPTIONS]')
         print()
-        print('  -i, --instance <instance ID>    Instance ID (default: pki-tomcat).')
-        print('      --pkcs12-file               PKCS #12 file to store certificates and keys.')
-        print('      --pkcs12-password           Password for the PKCS #12 file.')
-        print('      --pkcs12-password-file      File containing the PKCS #12 password.')
-        print('  -v, --verbose                   Run in verbose mode.')
-        print('      --help                      Show help message.')
+        print('  -i, --instance <instance ID>       Instance ID (default: pki-tomcat).')
+        print('      --pkcs12-file <path>           PKCS #12 file to store certificates and keys.')
+        print('      --pkcs12-password <password>   Password for the PKCS #12 file.')
+        print('      --pkcs12-password-file <path>  File containing the PKCS #12 password.')
+        print('  -v, --verbose                      Run in verbose mode.')
+        print('      --help                         Show help message.')
         print()
 
     def execute(self, args):
@@ -85,7 +85,7 @@ class OCSPClonePrepareCLI(pki.cli.CLI):
             if o in ('-i', '--instance'):
                 instance_name = a
 
-            elif o == '--pkcs12':
+            elif o == '--pkcs12-file':
                 pkcs12_file = a
 
             elif o == '--pkcs12-password':
diff --git a/base/server/python/pki/server/cli/tks.py b/base/server/python/pki/server/cli/tks.py
index 55b506bde..bf96d9610 100644
--- a/base/server/python/pki/server/cli/tks.py
+++ b/base/server/python/pki/server/cli/tks.py
@@ -57,12 +57,12 @@ class TKSClonePrepareCLI(pki.cli.CLI):
     def print_help(self):
         print('Usage: pki-server tks-clone-prepare [OPTIONS]')
         print()
-        print('  -i, --instance <instance ID>    Instance ID (default: pki-tomcat).')
-        print('      --pkcs12-file               PKCS #12 file to store certificates and keys.')
-        print('      --pkcs12-password           Password for the PKCS #12 file.')
-        print('      --pkcs12-password-file      File containing the PKCS #12 password.')
-        print('  -v, --verbose                   Run in verbose mode.')
-        print('      --help                      Show help message.')
+        print('  -i, --instance <instance ID>       Instance ID (default: pki-tomcat).')
+        print('      --pkcs12-file <path>           PKCS #12 file to store certificates and keys.')
+        print('      --pkcs12-password <password>   Password for the PKCS #12 file.')
+        print('      --pkcs12-password-file <path>  File containing the PKCS #12 password.')
+        print('  -v, --verbose                      Run in verbose mode.')
+        print('      --help                         Show help message.')
         print()
 
     def execute(self, args):
diff --git a/base/server/python/pki/server/cli/tps.py b/base/server/python/pki/server/cli/tps.py
index 54c99a6de..7284eaa84 100644
--- a/base/server/python/pki/server/cli/tps.py
+++ b/base/server/python/pki/server/cli/tps.py
@@ -57,12 +57,12 @@ class TPSClonePrepareCLI(pki.cli.CLI):
     def print_help(self):
         print('Usage: pki-server tps-clone-prepare [OPTIONS]')
         print()
-        print('  -i, --instance <instance ID>    Instance ID (default: pki-tomcat).')
-        print('      --pkcs12-file               PKCS #12 file to store certificates and keys.')
-        print('      --pkcs12-password           Password for the PKCS #12 file.')
-        print('      --pkcs12-password-file      File containing the PKCS #12 password.')
-        print('  -v, --verbose                   Run in verbose mode.')
-        print('      --help                      Show help message.')
+        print('  -i, --instance <instance ID>       Instance ID (default: pki-tomcat).')
+        print('      --pkcs12-file <path>           PKCS #12 file to store certificates and keys.')
+        print('      --pkcs12-password <password>   Password for the PKCS #12 file.')
+        print('      --pkcs12-password-file <path>  File containing the PKCS #12 password.')
+        print('  -v, --verbose                      Run in verbose mode.')
+        print('      --help                         Show help message.')
         print()
 
     def execute(self, args):