api work

CHANGELOG.md

@@ -116,6 +116,8 @@
 
 * **breaking change:** "om node freeze" is now local only. Use "om cluster freeze" for the orchestrated freeze of all nodes. Same applies to "unfreeze" and its hidden alias "thaw".
 
+* **breaking change:** "om cluster abort" replaces "om node abort" to abort the pending cluster action orchestration.
+
 * **breaking change:** "om ... set|unset" no longer accept --param and --value. Use --kw instead, which was also supported in v2.
 
 * "om monitor" instance availability icons changes:

cmd/all.go

@@ -11,9 +11,17 @@ func init() {
 	cmdObjectComplianceShow := newCmdObjectComplianceShow(kind)
 	cmdObjectComplianceList := newCmdObjectComplianceList(kind)
 	cmdObjectEdit := newCmdObjectEdit(kind)
+	cmdObjectInstance := newCmdObjectInstance(kind)
+	cmdObjectInstanceConfig := newCmdObjectInstanceConfig(kind)
+	cmdObjectInstanceMonitor := newCmdObjectInstanceMonitor(kind)
+	cmdObjectInstanceStatus := newCmdObjectInstanceStatus(kind)
 	cmdObjectSet := newCmdObjectSet(kind)
 	cmdObjectPrint := newCmdObjectPrint(kind)
 	cmdObjectPrintConfig := newCmdObjectPrintConfig(kind)
+	cmdObjectResource := newCmdObjectResource(kind)
+	cmdObjectResourceConfig := newCmdObjectResourceConfig(kind)
+	cmdObjectResourceMonitor := newCmdObjectResourceMonitor(kind)
+	cmdObjectResourceStatus := newCmdObjectResourceStatus(kind)
 	cmdObjectPush := newCmdObjectPush(kind)
 	cmdObjectSync := newCmdObjectSync(kind)
 	cmdObjectValidate := newCmdObjectValidate(kind)
@@ -25,8 +33,10 @@ func init() {
 		cmdObjectCollector,
 		cmdObjectCompliance,
 		cmdObjectEdit,
+		cmdObjectInstance,
 		cmdObjectPrint,
 		cmdObjectPush,
+		cmdObjectResource,
 		cmdObjectSet,
 		cmdObjectSync,
 		cmdObjectValidate,
@@ -60,6 +70,36 @@ func init() {
 		newCmdObjectUnprovision(kind),
 		newCmdObjectUnset(kind),
 	)
+	cmdObjectInstanceConfig.AddCommand(
+		newCmdObjectInstanceConfigLs(kind),
+	)
+	cmdObjectInstanceMonitor.AddCommand(
+		newCmdObjectInstanceMonitorLs(kind),
+	)
+	cmdObjectInstanceStatus.AddCommand(
+		newCmdObjectInstanceStatusLs(kind),
+	)
+	cmdObjectInstance.AddCommand(
+		cmdObjectInstanceConfig,
+		cmdObjectInstanceMonitor,
+		cmdObjectInstanceStatus,
+		newCmdObjectInstanceLs(kind),
+	)
+	cmdObjectResourceConfig.AddCommand(
+		newCmdObjectResourceConfigLs(kind),
+	)
+	cmdObjectResourceMonitor.AddCommand(
+		newCmdObjectResourceMonitorLs(kind),
+	)
+	cmdObjectResourceStatus.AddCommand(
+		newCmdObjectResourceStatusLs(kind),
+	)
+	cmdObjectResource.AddCommand(
+		cmdObjectResourceConfig,
+		cmdObjectResourceMonitor,
+		cmdObjectResourceStatus,
+		newCmdObjectResourceLs(kind),
+	)
 	cmdObjectEdit.AddCommand(
 		newCmdObjectEditConfig(kind),
 	)

cmd/ccfg.go

@@ -18,6 +18,7 @@ func init() {
 		cmdObjectSet,
 		cmdObjectPrint,
 		cmdObjectValidate,
+		newCmdClusterAbort(),
 		newCmdClusterFreeze(),
 		newCmdClusterThaw(),
 		newCmdClusterUnfreeze(),

cmd/cfg.go

@@ -5,6 +5,7 @@ func init() {
 
 	cmdObject := newCmdCfg()
 	cmdObjectEdit := newCmdObjectEdit(kind)
+	cmdObjectInstance := newCmdObjectInstance(kind)
 	cmdObjectSet := newCmdObjectSet(kind)
 	cmdObjectPrint := newCmdObjectPrint(kind)
 	cmdObjectPrintConfig := newCmdObjectPrintConfig(kind)
@@ -15,6 +16,7 @@ func init() {
 	)
 	cmdObject.AddCommand(
 		cmdObjectEdit,
+		cmdObjectInstance,
 		cmdObjectPrint,
 		cmdObjectSet,
 		cmdObjectValidate,
@@ -39,6 +41,9 @@ func init() {
 	cmdObjectEdit.AddCommand(
 		newCmdObjectEditConfig(kind),
 	)
+	cmdObjectInstance.AddCommand(
+		newCmdObjectInstanceLs(kind),
+	)
 	cmdObjectPrint.AddCommand(
 		cmdObjectPrintConfig,
 		newCmdObjectPrintStatus(kind),

cmd/factory.go

@@ -135,6 +135,21 @@ func newCmdArrayLs() *cobra.Command {
 	return cmd
 }
 
+func newCmdClusterAbort() *cobra.Command {
+	var options commands.CmdClusterAbort
+	cmd := &cobra.Command{
+		Use:   "abort",
+		Short: "abort the running orchestration",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run()
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsAsync(flags, &options.OptsAsync)
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	return cmd
+}
+
 func newCmdClusterFreeze() *cobra.Command {
 	var options commands.CmdClusterFreeze
 	cmd := &cobra.Command{
@@ -525,21 +540,6 @@ func newCmdNetworkStatus() *cobra.Command {
 	return cmd
 }
 
-func newCmdNodeAbort() *cobra.Command {
-	var options commands.CmdNodeAbort
-	cmd := &cobra.Command{
-		Use:   "abort",
-		Short: "abort the running orchestration",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return options.Run()
-		},
-	}
-	flags := cmd.Flags()
-	addFlagsAsync(flags, &options.OptsAsync)
-	addFlagsGlobal(flags, &options.OptsGlobal)
-	return cmd
-}
-
 func newCmdNodeCapabilitiesList() *cobra.Command {
 	var options commands.CmdNodeCapabilitiesList
 	cmd := &cobra.Command{
@@ -1632,6 +1632,35 @@ func newCmdObjectComplianceList(kind string) *cobra.Command {
 	}
 }
 
+func newCmdObjectInstance(kind string) *cobra.Command {
+	return &cobra.Command{
+		Use:     "instance",
+		Short:   "config, status, monitor, ls",
+		Aliases: []string{"inst", "in"},
+	}
+}
+
+func newCmdObjectInstanceConfig(kind string) *cobra.Command {
+	return &cobra.Command{
+		Use:     "config",
+		Aliases: []string{"conf", "cf"},
+	}
+}
+
+func newCmdObjectInstanceMonitor(kind string) *cobra.Command {
+	return &cobra.Command{
+		Use:     "monitor",
+		Aliases: []string{"mon"},
+	}
+}
+
+func newCmdObjectInstanceStatus(kind string) *cobra.Command {
+	return &cobra.Command{
+		Use:     "status",
+		Aliases: []string{"stat", "st"},
+	}
+}
+
 func newCmdObjectComplianceShow(kind string) *cobra.Command {
 	return &cobra.Command{
 		Use:     "show",
@@ -2179,6 +2208,66 @@ func newCmdObjectPrintSchedule(kind string) *cobra.Command {
 	return cmd
 }
 
+func newCmdObjectInstanceLs(kind string) *cobra.Command {
+	var options commands.CmdObjectInstanceLs
+	cmd := &cobra.Command{
+		Use:     "ls",
+		Aliases: []string{"list"},
+		Short:   "object instances list",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run(selectorFlag, kind)
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	return cmd
+}
+
+func newCmdObjectInstanceConfigLs(kind string) *cobra.Command {
+	var options commands.CmdObjectInstanceConfigLs
+	cmd := &cobra.Command{
+		Use:     "ls",
+		Aliases: []string{"list"},
+		Short:   "object instance configs list",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run(selectorFlag, kind)
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	return cmd
+}
+
+func newCmdObjectInstanceStatusLs(kind string) *cobra.Command {
+	var options commands.CmdObjectInstanceStatusLs
+	cmd := &cobra.Command{
+		Use:     "ls",
+		Aliases: []string{"list"},
+		Short:   "object instance statuses list",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run(selectorFlag, kind)
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	return cmd
+}
+
+func newCmdObjectInstanceMonitorLs(kind string) *cobra.Command {
+	var options commands.CmdObjectInstanceMonitorLs
+	cmd := &cobra.Command{
+		Use:     "ls",
+		Aliases: []string{"list"},
+		Short:   "object instances monitors list",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run(selectorFlag, kind)
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	return cmd
+}
+
 func newCmdObjectPrintStatus(kind string) *cobra.Command {
 	var options commands.CmdObjectPrintStatus
 	cmd := &cobra.Command{
@@ -2381,6 +2470,95 @@ func newCmdObjectSyncUpdate(kind string) *cobra.Command {
 	return cmd
 }
 
+func newCmdObjectResource(kind string) *cobra.Command {
+	return &cobra.Command{
+		Use:     "resource",
+		Short:   "config, status, monitor, ls",
+		Aliases: []string{"res"},
+	}
+}
+
+func newCmdObjectResourceConfig(kind string) *cobra.Command {
+	return &cobra.Command{
+		Use:     "config",
+		Aliases: []string{"conf", "cf"},
+	}
+}
+
+func newCmdObjectResourceMonitor(kind string) *cobra.Command {
+	return &cobra.Command{
+		Use:     "monitor",
+		Aliases: []string{"mon"},
+	}
+}
+
+func newCmdObjectResourceStatus(kind string) *cobra.Command {
+	return &cobra.Command{
+		Use:     "status",
+		Aliases: []string{"stat", "st"},
+	}
+}
+
+func newCmdObjectResourceLs(kind string) *cobra.Command {
+	var options commands.CmdObjectResourceLs
+	cmd := &cobra.Command{
+		Use:   "ls",
+		Short: "list the selected resource (config, monitor, status)",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run(selectorFlag, kind)
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	addFlagRID(flags, &options.RID)
+	return cmd
+}
+
+func newCmdObjectResourceConfigLs(kind string) *cobra.Command {
+	var options commands.CmdObjectResourceConfigLs
+	cmd := &cobra.Command{
+		Use:   "ls",
+		Short: "list the selected resource config",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run(selectorFlag, kind)
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	addFlagRID(flags, &options.RID)
+	return cmd
+}
+
+func newCmdObjectResourceMonitorLs(kind string) *cobra.Command {
+	var options commands.CmdObjectResourceMonitorLs
+	cmd := &cobra.Command{
+		Use:   "ls",
+		Short: "list the selected resource monitor",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run(selectorFlag, kind)
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	addFlagRID(flags, &options.RID)
+	return cmd
+}
+
+func newCmdObjectResourceStatusLs(kind string) *cobra.Command {
+	var options commands.CmdObjectResourceStatusLs
+	cmd := &cobra.Command{
+		Use:   "ls",
+		Short: "list the selected resource status",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return options.Run(selectorFlag, kind)
+		},
+	}
+	flags := cmd.Flags()
+	addFlagsGlobal(flags, &options.OptsGlobal)
+	addFlagRID(flags, &options.RID)
+	return cmd
+}
+
 func newCmdObjectRun(kind string) *cobra.Command {
 	var options commands.CmdObjectRun
 	cmd := &cobra.Command{

cmd/node.go

@@ -120,7 +120,6 @@ func init() {
 		cmdNodePush,
 		cmdNodeRelay,
 		cmdNodeValidate,
-		newCmdNodeAbort(),
 		newCmdNodeChecks(),
 		newCmdNodeClear(),
 		newCmdNodeDoc(),

cmd/sec.go

@@ -5,6 +5,7 @@ func init() {
 
 	cmdObject := newCmdSec()
 	cmdObjectEdit := newCmdObjectEdit(kind)
+	cmdObjectInstance := newCmdObjectInstance(kind)
 	cmdObjectSet := newCmdObjectSet(kind)
 	cmdObjectPrint := newCmdObjectPrint(kind)
 	cmdObjectPrintConfig := newCmdObjectPrintConfig(kind)
@@ -15,6 +16,7 @@ func init() {
 	)
 	cmdObject.AddCommand(
 		cmdObjectEdit,
+		cmdObjectInstance,
 		cmdObjectPrint,
 		cmdObjectSet,
 		cmdObjectValidate,
@@ -41,6 +43,9 @@ func init() {
 	cmdObjectEdit.AddCommand(
 		newCmdObjectEditConfig(kind),
 	)
+	cmdObjectInstance.AddCommand(
+		newCmdObjectInstanceLs(kind),
+	)
 	cmdObjectPrint.AddCommand(
 		cmdObjectPrintConfig,
 		newCmdObjectPrintStatus(kind),