Hi,
I fixed the bugzilla issue 1341953. And enhance code of pki-server
instance-start.
And also i fixed man page for pki-server instance-cert.
Please review this patches.
PFA.
Thanks
Amol K
>From e7ca72b6346126b6a4fb5f3d3c51f61fa36c15cf Mon Sep 17 00:00:00 2001
From: Amol Kahat <aka...@redhat.com>
Date: Tue, 14 Jun 2016 16:36:40 +0530
Subject: [PATCH] Fixed pki-server instance-start <instance> command. Fixed
pki-server instance-stop <instance> command.
Fixes : https://bugzilla.redhat.com/show_bug.cgi?id=1341953
Signed-off-by: Amol Kahat <aka...@redhat.com>
---
base/server/python/pki/server/cli/instance.py | 31 +++++++++++++++++++--------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/base/server/python/pki/server/cli/instance.py b/base/server/python/pki/server/cli/instance.py
index d5fc644a1d9ae992907aed8674c793e26bdc0ef8..8eff750872715db109ef83a76a6a6766d0bacdc1 100644
--- a/base/server/python/pki/server/cli/instance.py
+++ b/base/server/python/pki/server/cli/instance.py
@@ -329,12 +329,19 @@ class InstanceStartCLI(pki.cli.CLI):
sys.exit(1)
instance_name = args[0]
-
- instance = pki.server.PKIInstance(instance_name)
- instance.load()
- instance.start()
-
- self.print_message('%s instance started' % instance_name)
+ try:
+ instance = pki.server.PKIInstance(instance_name)
+ if instance.is_valid():
+ if instance.is_active():
+ self.print_message('%s instance already started.' % instance_name)
+ else:
+ instance.load()
+ instance.start()
+ self.print_message('%s instance started' % instance_name)
+ else:
+ self.print_message('%s no such instance exists.' % instance_name)
+ except :
+ self.print_message('Error in starting %s' % instance_name)
class InstanceStopCLI(pki.cli.CLI):
@@ -381,10 +388,16 @@ class InstanceStopCLI(pki.cli.CLI):
instance_name = args[0]
instance = pki.server.PKIInstance(instance_name)
- instance.load()
- instance.stop()
+ if instance.is_valid():
+ if instance.is_active():
+ instance.load()
+ instance.stop()
- self.print_message('%s instance stopped' % instance_name)
+ self.print_message('%s instance stopped' % instance_name)
+ else:
+ self.print_message('%s instance already stopped' % instance_name)
+ else:
+ self.print_message('%s no such instance exits.' % instance_name)
class InstanceMigrateCLI(pki.cli.CLI):
--
2.5.5
>From 2e8d8ec9f8a29f541d99de7c71c1bedd3b268cc9 Mon Sep 17 00:00:00 2001
From: Amol Kahat <aka...@redhat.com>
Date: Tue, 14 Jun 2016 12:42:32 +0530
Subject: [PATCH] Added entry of pki-server instance-cert command in man page.
Signed-off-by: Amol Kahat <aka...@redhat.com>
---
base/server/man/man8/pki-server-instance.8 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/base/server/man/man8/pki-server-instance.8 b/base/server/man/man8/pki-server-instance.8
index 4d0f52bd97ae27b008e25f7765b03eeaa166a139..bbbc0f9e7f20e8f538e39be1bab8ba4b41712132 100644
--- a/base/server/man/man8/pki-server-instance.8
+++ b/base/server/man/man8/pki-server-instance.8
@@ -20,6 +20,7 @@ pki-server instance \- Command-Line Interface for managing Certificate System in
.SH SYNOPSIS
.nf
\fBpki-server [CLI options] instance\fR
+\fBpki-server [CLI options] instance-cert\fR
\fBpki-server [CLI options] instance-find\fR
\fBpki-server [CLI options] instance-show\fR <instance ID>
\fBpki-server [CLI options] instance-start\fR <instance ID>
@@ -48,6 +49,11 @@ enabling or disabling password prompted instance startup using \fBnuxwdog\fR.
This command is to list available instance commands.
.RE
.PP
+\fBpki-server [CLI options] instance-cert\fR
+.RS 4
+This command is to export the all instance cerficates in p12 file.
+.RE
+.PP
\fBpki-server [CLI options] instance-find\fR
.RS 4
This command is to list local CS instances.
--
2.5.5
_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel
