certmanager updates

cmd/certmanagerctl/main.go

@@ -66,19 +66,23 @@ type Util struct {
 	access     client.Access
 	cont       *cmctl.ControlClient
 
-	caFilenamesList   string
-	certFilename      string
-	hostnameList      string
-	ipAdressesList    string
-	issuerCommonName  string
-	issuerID          int64
-	issuerName        string
-	keyFilename       string
-	signerID          int64
-	signerName        string
-	serviceCommonName string
-	serviceID         int64
-	serviceName       string
+	caFilenamesList               string
+	certFilename                  string
+	keyFilename                   string
+	issuerOrganizationName        string
+	issuerOrganizationalUnitName  string
+	issuerCommonName              string
+	issuerID                      int64
+	issuerName                    string
+	signerID                      int64
+	signerName                    string
+	serviceOrganizationName       string
+	serviceOrganizationalUnitName string
+	serviceCommonName             string
+	hostnameList                  string
+	ipAdressesList                string
+	serviceID                     int64
+	serviceName                   string
 
 	accountID   int64
 	username    string
@@ -190,6 +194,8 @@ func (util *Util) GetOpt() error {
 	case createIssuerPairCmd:
 		flagSet := flag.NewFlagSet(createIssuerPairCmd, flag.ExitOnError)
 
+		flagSet.StringVar(&util.issuerOrganizationName, "org", util.issuerOrganizationName, "new issuer organization name")
+		flagSet.StringVar(&util.issuerOrganizationalUnitName, "unit", util.issuerOrganizationalUnitName, "new issuer organizational unit name")
 		flagSet.StringVar(&util.issuerCommonName, "cn", util.issuerCommonName, "new issuer canonic name")
 		flagSet.Int64Var(&util.signerID, "signerID", util.signerID, "optional issuer ID for sign")
 		flagSet.StringVar(&util.signerName, "signerName", util.signerName, "optional issuer name for sign")
@@ -287,7 +293,10 @@ func (util *Util) GetOpt() error {
 	case createServicePairCmd:
 		flagSet := flag.NewFlagSet(createServicePairCmd, flag.ExitOnError)
 
-		flagSet.StringVar(&util.issuerCommonName, "cn", util.issuerCommonName, "new service canonic name")
+		flagSet.StringVar(&util.serviceOrganizationName, "org", util.serviceOrganizationName, "new service organization name")
+		flagSet.StringVar(&util.serviceOrganizationalUnitName, "unit", util.serviceOrganizationalUnitName, "new service organizational unit name")
+		flagSet.StringVar(&util.serviceCommonName, "cn", util.serviceCommonName, "new service canonic name")
+
 		flagSet.StringVar(&util.issuerName, "issuerName", util.issuerName, "issuer name")
 		flagSet.Int64Var(&util.issuerID, "issuerID", util.issuerID, "issuer ID")