diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2016-07-01 10:35:21 +0530 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-07-01 19:19:45 +0200 |
| commit | eb0f8d0f1e9d396efb071c6432aa22ff0a39d613 (patch) | |
| tree | d0cebb090f78da70c9402d75339e4a63f0f8088f /base/server/python | |
| parent | ab8655ca693ddf5afc0579db42cfbea61e8fee89 (diff) | |
| download | pki-eb0f8d0f1e9d396efb071c6432aa22ff0a39d613.tar.gz pki-eb0f8d0f1e9d396efb071c6432aa22ff0a39d613.tar.xz pki-eb0f8d0f1e9d396efb071c6432aa22ff0a39d613.zip | |
Updated notification message for TPS subsystem command
Partially fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1351295
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/cli/tps.py | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/base/server/python/pki/server/cli/tps.py b/base/server/python/pki/server/cli/tps.py index 63da3414e..1f71b8ece 100644 --- a/base/server/python/pki/server/cli/tps.py +++ b/base/server/python/pki/server/cli/tps.py @@ -127,9 +127,15 @@ class TPSClonePrepareCLI(pki.cli.CLI): sys.exit(1) instance = pki.server.PKIInstance(instance_name) + if not instance.is_valid(): + print('ERROR: Invalid instance %s.' % instance_name) + sys.exit(1) instance.load() subsystem = instance.get_subsystem('tps') + if not subsystem: + print("ERROR: No TPS subsystem in instance %s." % instance_name) + sys.exit(1) tmpdir = tempfile.mkdtemp() @@ -228,12 +234,15 @@ class TPSDBVLVFindCLI(pki.cli.CLI): sys.exit(1) instance = pki.server.PKIInstance(instance_name) + if not instance.is_valid(): + print('ERROR: Invalid instance %s.' % instance_name) + sys.exit(1) instance.load() subsystem = instance.get_subsystem('tps') - if not subsystem: - raise Exception('Subsystem not found') + print("ERROR: No TPS subsystem in instance %s." % instance_name) + sys.exit(1) self.find_vlv(subsystem, bind_dn, bind_password) @@ -340,12 +349,15 @@ class TPSDBVLVAddCLI(pki.cli.CLI): sys.exit(1) instance = pki.server.PKIInstance(instance_name) + if not instance.is_valid(): + print('ERROR: Invalid instance %s.' % instance_name) + sys.exit(1) instance.load() subsystem = instance.get_subsystem('tps') - if not subsystem: - raise Exception('Subsystem not found') + print("ERROR: No TPS subsystem in instance %s." % instance_name) + sys.exit(1) if out_file: self.generate_ldif(subsystem, out_file) @@ -450,12 +462,15 @@ class TPSDBVLVDeleteCLI(pki.cli.CLI): sys.exit(1) instance = pki.server.PKIInstance(instance_name) + if not instance.is_valid(): + print('ERROR: Invalid instance %s.' % instance_name) + sys.exit(1) instance.load() subsystem = instance.get_subsystem('tps') - if not subsystem: - raise Exception('Subsystem not found') + print("ERROR: No TPS subsystem in instance %s." % instance_name) + sys.exit(1) if out_file: self.generate_ldif(subsystem, out_file) @@ -582,12 +597,15 @@ class TPSDBVLVReindexCLI(pki.cli.CLI): sys.exit(1) instance = pki.server.PKIInstance(instance_name) + if not instance.is_valid(): + print('ERROR: Invalid instance %s.' % instance_name) + sys.exit(1) instance.load() subsystem = instance.get_subsystem('tps') - if not subsystem: - raise Exception('Subsystem not found') + print("ERROR: No TPS subsystem in instance %s." % instance_name) + sys.exit(1) if out_file: self.generate_ldif(subsystem, out_file) |