diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2016-06-30 16:53:36 +0530 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-07-01 01:42:30 +0200 |
| commit | 8e40b74dc5d314912c65722b4284cab0ffbffbcc (patch) | |
| tree | f815da57911f15c0b001fbd871bbc9c33c0b4571 /base | |
| parent | 99a93af1ca5cce26d625ce7cee07dab4a890f1be (diff) | |
| download | pki-8e40b74dc5d314912c65722b4284cab0ffbffbcc.tar.gz pki-8e40b74dc5d314912c65722b4284cab0ffbffbcc.tar.xz pki-8e40b74dc5d314912c65722b4284cab0ffbffbcc.zip | |
Updated notification message for kra-db-vlv-del command
Partially fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1351295
Diffstat (limited to 'base')
| -rw-r--r-- | base/server/python/pki/server/cli/kra.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/base/server/python/pki/server/cli/kra.py b/base/server/python/pki/server/cli/kra.py index 676d1f511..17611a82b 100644 --- a/base/server/python/pki/server/cli/kra.py +++ b/base/server/python/pki/server/cli/kra.py @@ -455,28 +455,34 @@ class KRADBVLVDeleteCLI(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() - self.delete_vlv(instance, bind_dn, bind_password) - def delete_vlv(self, instance, bind_dn, bind_password): subsystem = instance.get_subsystem('kra') + if not subsystem: - if self.verbose: - print('modify_kra_vlv: No KRA subsystem available. ' - 'Skipping ...') - return + print('ERROR: No KRA subsystem in instance %s.' % instance_name) + sys.exit(1) + + self.delete_vlv(subsystem, bind_dn, bind_password) + + print('KRA VLVs deleted from the database for ' + instance_name) + + def delete_vlv(self, subsystem, bind_dn, bind_password): + database = subsystem.config['internaldb.database'] if self.out_file: with open(self.out_file, "w") as f: for vlv in KRA_VLVS: - dn = ("cn=" + vlv + '-' + instance.name + + dn = ("cn=" + vlv + '-' + subsystem.instance.name + ',cn=' + database + ',cn=ldbm database, cn=plugins, cn=config') - index_dn = ("cn=" + vlv + '-' + instance.name + + index_dn = ("cn=" + vlv + '-' + subsystem.instance.name + "Index," + dn) f.write('dn: ' + index_dn + '\n') f.write('changetype: delete' + '\n') @@ -491,9 +497,9 @@ class KRADBVLVDeleteCLI(pki.cli.CLI): bind_password=bind_password) try: for vlv in KRA_VLVS: - dn = ("cn=" + vlv + '-' + instance.name + ',cn=' + database + + dn = ("cn=" + vlv + '-' + subsystem.instance.name + ',cn=' + database + ',cn=ldbm database, cn=plugins, cn=config') - index_dn = "cn=" + vlv + '-' + instance.name + "Index," + dn + index_dn = "cn=" + vlv + '-' + subsystem.instance.name + "Index," + dn try: conn.ldap.delete_s(index_dn) @@ -508,8 +514,6 @@ class KRADBVLVDeleteCLI(pki.cli.CLI): finally: conn.close() - print('KRA VLVs deleted from the database for ' + instance.name) - class KRADBVLVReindexCLI(pki.cli.CLI): |