controller: get virtualmachinespec

Author: weizhouapache

Development.md

@@ -90,7 +90,7 @@ Modes and CLI behavior
 	- Unsupported in standalone: `Application`, `Component`, and `VirtualMachineSpec`. These higher-level constructs require the controller and DB.
 	- Supported in standalone: direct CloudStack resource kinds such as `VirtualMachine`, `Network`, `Volume`, `SSHKey`, `SecurityGroup`, `AffinityGroup`, and `UserData` (subject to SDK coverage).
 
-- Default behavior (cluster mode): when `-s` is not specified the CLI assumes cluster mode and operations are intended to be persisted to the database and reconciled by the controller. Resources are managed via the database/controller.
+- Default behavior (controller mode): when `-s` is not specified the CLI assumes controller mode and operations are intended to be persisted to the database and reconciled by the controller. Resources are managed via the database/controller.
 
 Examples:
 
@@ -108,7 +108,7 @@ Examples:
 CLI flags: `--all / -A`
 ------------------------
 
-Two commands support an `--all` (short `-A`) flag in cluster mode to query CloudStack directly rather than the controller DB:
+Two commands support an `--all` (short `-A`) flag in controller mode to query CloudStack directly rather than the controller DB:
 
 - `get VirtualMachine -A` — list all VMs from CloudStack (including unmanaged VMs); without `-A` the controller returns only VMs persisted in the DB (managed by cloudstackctl).
 - `describe <Kind> <name> -A` — describe the named resource by querying CloudStack directly rather than using controller-managed state.

README.md

@@ -203,7 +203,7 @@ spec:
 Usage notes:
 
 - To run the CLI in standalone mode (no DB/controller): `./cloudstackctl -s get VirtualMachine` or `./cloudstackctl -s apply -f vm.yaml`.
-- To run in cluster mode (default), ensure the controller and Postgres are running; `apply` will send resources to the controller which persists them to the DB and reconciles via CloudStack.
+- To run in controller mode (default), ensure the controller and Postgres are running; `apply` will send resources to the controller which persists them to the DB and reconciles via CloudStack.
 
 ---
 

cmd/cli/apply.go

@@ -55,7 +55,7 @@ var applyCmd = &cobra.Command{
 			return
 		}
 
-		// cluster mode: apply by POSTing to controller HTTP API
+		// controller mode: apply by POSTing to controller HTTP API
 		body, err := ControllerRequest("POST", "/apply", jsonData)
 		if err != nil {
 			log.Fatalf("Failed to POST to controller: %v", err)

cmd/cli/describe.go

@@ -84,5 +84,5 @@ func init() {
 var describeAll bool
 
 func init() {
-	describeCmd.Flags().BoolVarP(&describeAll, "all", "A", false, "Describe a VM from CloudStack (cluster mode only)")
+	describeCmd.Flags().BoolVarP(&describeAll, "all", "A", false, "Describe a VM from CloudStack (controller mode only)")
 }

cmd/cli/get.go

@@ -83,7 +83,7 @@ func init() {
 var getAll bool
 
 func init() {
-	getCmd.Flags().BoolVarP(&getAll, "all", "A", false, "Show all VMs from CloudStack (include unmanaged) — cluster mode only")
+	getCmd.Flags().BoolVarP(&getAll, "all", "A", false, "Show all VMs from CloudStack (include unmanaged) — controller mode only")
 }
 
 // tryDecodeAndPrint attempts to decode controller JSON into known typed

controller/cmd_delete.go

@@ -107,7 +107,7 @@ func DeleteVM(name string) {
 	log.Printf("VM %s deleted successfully", name)
 }
 
-// DeleteNetwork deletes a Network resource (handles standalone and cluster modes)
+// DeleteNetwork deletes a Network resource (handles standalone and controller modes)
 func DeleteNetwork(name string) {
 	if db.DB == nil {
 		// standalone or DB not initialized: try CloudStack directly

controller/controller.go

@@ -53,7 +53,7 @@ func (c *Controller) Start() {
 			w.Write([]byte("ok"))
 		})
 
-		// Accept resource apply requests from the CLI in cluster mode
+		// Accept resource apply requests from the CLI in controller mode
 		http.HandleFunc("/apply", func(w http.ResponseWriter, r *http.Request) {
 			if r.Method != http.MethodPost {
 				http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
@@ -256,6 +256,33 @@ func (c *Controller) Start() {
 				w.WriteHeader(http.StatusOK)
 				w.Write(b)
 				return
+			case "VirtualMachineSpec":
+				var specs []v1.VirtualMachineSpecResource
+				if db.DB == nil {
+					http.Error(w, "database unavailable", http.StatusServiceUnavailable)
+					return
+				}
+				if name != "" {
+					var vs v1.VirtualMachineSpecResource
+					if err := db.DB.Where("metadata_name = ?", name).First(&vs).Error; err != nil {
+						http.Error(w, "VirtualMachineSpec not found", http.StatusNotFound)
+						return
+					}
+					b, _ := json.Marshal(vs)
+					w.Header().Set("Content-Type", "application/json")
+					w.WriteHeader(http.StatusOK)
+					w.Write(b)
+					return
+				}
+				if err := db.DB.Find(&specs).Error; err != nil {
+					http.Error(w, "failed to list VirtualMachineSpec", http.StatusInternalServerError)
+					return
+				}
+				b, _ := json.Marshal(specs)
+				w.Header().Set("Content-Type", "application/json")
+				w.WriteHeader(http.StatusOK)
+				w.Write(b)
+				return
 			case "Component":
 				var comps []v1.Component
 				if db.DB == nil {
@@ -380,6 +407,17 @@ func (c *Controller) Start() {
 				w.WriteHeader(http.StatusOK)
 				w.Write(b)
 				return
+			case "VirtualMachineSpec":
+				var vs v1.VirtualMachineSpecResource
+				if db.DB == nil || db.DB.Where("metadata_name = ?", name).First(&vs).Error != nil {
+					http.Error(w, "VirtualMachineSpec not found", http.StatusNotFound)
+					return
+				}
+				b, _ := json.Marshal(vs)
+				w.Header().Set("Content-Type", "application/json")
+				w.WriteHeader(http.StatusOK)
+				w.Write(b)
+				return
 			case "VirtualMachine":
 				// If client asked for all, delegate to handlers which query CloudStack
 				if r.URL.Query().Get("all") == "true" {