pkg: fix test errors in standalone mode

Author: weizhouapache

README.md

@@ -118,6 +118,7 @@ kind: VirtualMachineSpec
 metadata:
   name: basic-vm-spec
 spec:
+  zone: zone-1
   template: ubuntu-22.04
   serviceOffering: medium
   networkIds:
@@ -138,10 +139,12 @@ kind: Application
 metadata:
   name: app-with-reused-vmspec
 spec:
-  project: 987e6543-e21b-12d3-a456-426655440000
+  project: project-2
   components:
     - name: frontend
       virtualMachineSpec: basic-vm-spec
+      overrides:
+        - sshKeys: web
       replicas: 2
       healthChecks:
         - type: ping
@@ -157,7 +160,7 @@ kind: Application
 metadata:
   name: simple-app
 spec:
-  project: 987e6543-e21b-12d3-a456-426655440000
+  project: project-2
   components:
     - name: frontend
       virtualMachineSpec: basic-vm-spec
@@ -175,7 +178,8 @@ kind: VirtualMachine
 metadata:
   name: standalone-vm
 spec:
-  project: 987e6543-e21b-12d3-a456-426655440000
+  zone: zone-1
+  project: project-2
   template: ubuntu-22.04
   serviceOffering: medium
   networkIds:

apis/v1/types.go

@@ -139,13 +139,15 @@ type Network struct {
 
 // NetworkSpec defines the desired state of a Network
 type NetworkSpec struct {
-	Zone            string `yaml:"zone"`                      // CloudStack zone ID or name
-	NetworkOffering string `yaml:"networkOffering,omitempty"` // Network offering ID or name for creation
-	Description     string `yaml:"description,omitempty"`     // Human-friendly description / displayText
-	Gateway         string `yaml:"gateway,omitempty"`         // Gateway IP for shared networks
-	Netmask         string `yaml:"netmask,omitempty"`         // Netmask for shared networks
-	StartIP         string `yaml:"startIp,omitempty"`         // Start IP for static IP range (shared network)
-	EndIP           string `yaml:"endIp,omitempty"`           // End IP for static IP range (shared network)
+	Zone                   string      `yaml:"zone"`                             // CloudStack zone ID or name
+	NetworkOffering        string      `yaml:"networkOffering,omitempty"`        // Network offering ID or name for creation
+	Vlan                   interface{} `yaml:"vlan,omitempty"`                   // Optional VLAN tag for shared networks; may be string or number
+	BypassVlanOverlapCheck bool        `yaml:"bypassVlanOverlapCheck,omitempty"` // When true, do not normalize or validate VLAN value
+	Description            string      `yaml:"description,omitempty"`            // Human-friendly description / displayText
+	Gateway                string      `yaml:"gateway,omitempty"`                // Gateway IP for shared networks
+	Netmask                string      `yaml:"netmask,omitempty"`                // Netmask for shared networks
+	StartIP                string      `yaml:"startIp,omitempty"`                // Start IP for static IP range (shared network)
+	EndIP                  string      `yaml:"endIp,omitempty"`                  // End IP for static IP range (shared network)
 }
 
 // Volume represents a disk attached to a VM in CloudStack
@@ -170,10 +172,16 @@ type VolumeSpec struct {
 // SSHKey represents an SSH key pair for VM access in CloudStack
 type SSHKey struct {
 	gorm.Model
-	APIVersion string   `json:"apiVersion" yaml:"apiVersion"`
-	Kind       string   `json:"kind" yaml:"kind"` // "SSHKey"
-	Metadata   Metadata `json:"metadata" yaml:"metadata" gorm:"embedded"`
-	Status     Status   `json:"status,omitempty" gorm:"embedded"`
+	APIVersion string     `json:"apiVersion" yaml:"apiVersion"`
+	Kind       string     `json:"kind" yaml:"kind"` // "SSHKey"
+	Metadata   Metadata   `json:"metadata" yaml:"metadata" gorm:"embedded"`
+	Spec       SSHKeySpec `json:"spec,omitempty" yaml:"spec,omitempty" gorm:"embedded"`
+	Status     Status     `json:"status,omitempty" gorm:"embedded"`
+}
+
+// SSHKeySpec holds the public key material for registering an SSH keypair
+type SSHKeySpec struct {
+	PublicKey string `yaml:"publicKey"`
 }
 
 // SecurityGroup represents a firewall rule set for VMs in CloudStack

examples/standalone/affinitygroup.yaml

@@ -3,6 +3,6 @@ kind: AffinityGroup
 metadata:
   name: vm-spread
 spec:
-  type: hostAntiAffinity
+  type: host anti-affinity
   name: vm-spread
   description: Spread VMs across hosts

examples/standalone/network-isolated.yaml

@@ -0,0 +1,9 @@
+apiVersion: cloudstackctl/v1
+kind: Network
+metadata:
+  name: example-network-isolated
+spec:
+  zone: zone-1
+  networkOffering: isolated-network-offering
+  cidr: 10.0.0.0/24
+  description: "Isolated network example used by standalone VMs"

examples/standalone/network-shared.yaml

@@ -0,0 +1,14 @@
+apiVersion: cloudstackctl/v1
+kind: Network
+metadata:
+  name: example-network-shared
+spec:
+  zone: zone-1
+  networkOffering: shared-network-offering
+  description: "Shared network example with static IP range"
+  vlan: 1000
+  startIp: 10.0.0.10
+  endIp: 10.0.0.100
+  gateway: 10.0.0.1
+  netmask: 255.255.255.0
+  bypassVlanOverlapCheck: true

examples/standalone/network.yaml

@@ -3,7 +3,6 @@ kind: Volume
 metadata:
   name: data-disk
 spec:
-  name: data-disk
   diskOffering: standard-hdd
   size: 50
   zone: zone-1

examples/standalone/volume.yaml

@@ -105,3 +105,25 @@ func ResolveAffinityGroup(name string) (string, error) {
 	}
 	return existing.Id, nil
 }
+
+// DeleteAffinityGroup deletes an affinity group by name.
+func DeleteAffinityGroup(name string) error {
+	client, err := cloudstack.NewClient()
+	if err != nil {
+		return fmt.Errorf("failed to create CloudStack client: %w", err)
+	}
+	existing, _, err := client.AffinityGroup.GetAffinityGroupByName(name)
+	if err != nil {
+		return fmt.Errorf("cloudstack API error: %w", err)
+	}
+	if existing == nil {
+		return fmt.Errorf("affinity group %s not found", name)
+	}
+	dp := client.AffinityGroup.NewDeleteAffinityGroupParams()
+	dp.SetId(existing.Id)
+	if _, err := client.AffinityGroup.DeleteAffinityGroup(dp); err != nil {
+		return fmt.Errorf("failed to delete affinity group %s: %w", name, err)
+	}
+	log.Printf("AffinityGroup %s deleted from CloudStack (id=%s)", name, existing.Id)
+	return nil
+}

pkg/handlers/affinitygroup.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"strconv"
+	"strings"
 	"text/tabwriter"
 
 	v1 "cloudstackctl/apis/v1"
@@ -49,7 +51,7 @@ func ListNetworks(name string) error {
 		return fmt.Errorf("cloudstack API error: %w", err)
 	}
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	fmt.Fprintln(w, "NAME\tID\tZONE\tDISPLAY TEXT\tTYPE\tSTATE")
+	fmt.Fprintln(w, "NAME\tID\tZONE\tVLAN\tDISPLAY TEXT\tTYPE\tSTATE")
 	for _, n := range resp.Networks {
 		display := n.Displaytext
 		if display == "" {
@@ -66,7 +68,21 @@ func ListNetworks(name string) error {
 			}
 		}
 
-		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\n", n.Name, n.Id, zoneName, display, n.Type, n.State)
+		// Attempt to extract VLAN information from the returned network object
+		// via JSON to avoid SDK field name differences across versions.
+		vlan := ""
+		if b, merr := json.Marshal(n); merr == nil {
+			var m map[string]interface{}
+			if uerr := json.Unmarshal(b, &m); uerr == nil {
+				if v, ok := m["vlan"].(string); ok {
+					vlan = v
+				} else if v, ok := m["vlanid"].(string); ok {
+					vlan = v
+				}
+			}
+		}
+
+		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n", n.Name, n.Id, zoneName, vlan, display, n.Type, n.State)
 	}
 	w.Flush()
 	return nil
@@ -150,10 +166,60 @@ func ApplyNetwork(netRes *v1.Network) error {
 		if zerr != nil {
 			return fmt.Errorf("failed to resolve zone %s: %w", netRes.Spec.Zone, zerr)
 		}
-		createParams := client.Network.NewCreateNetworkParams(name, netRes.Spec.NetworkOffering, zoneID)
+		// Resolve network offering name to ID; require resolution.
+		offeringID, offErr := ResolveNetworkOffering(netRes.Spec.NetworkOffering)
+		if offErr != nil {
+			return fmt.Errorf("failed to resolve network offering %s: %w", netRes.Spec.NetworkOffering, offErr)
+		}
+		createParams := client.Network.NewCreateNetworkParams(name, offeringID, zoneID)
 		if netRes.Spec.Description != "" {
 			createParams.SetDisplaytext(netRes.Spec.Description)
 		}
+
+		// Pass bypassvlanoverlapcheck through to CloudStack (supported by API)
+		createParams.SetBypassvlanoverlapcheck(netRes.Spec.BypassVlanOverlapCheck)
+
+		// If shared network fields are present, set them on the create params.
+		if netRes.Spec.Gateway != "" {
+			createParams.SetGateway(netRes.Spec.Gateway)
+		}
+		if netRes.Spec.Netmask != "" {
+			createParams.SetNetmask(netRes.Spec.Netmask)
+		}
+		if netRes.Spec.StartIP != "" {
+			createParams.SetStartip(netRes.Spec.StartIP)
+		}
+		if netRes.Spec.EndIP != "" {
+			createParams.SetEndip(netRes.Spec.EndIP)
+		}
+		if netRes.Spec.Vlan != nil {
+			var vlanVal string
+			switch v := netRes.Spec.Vlan.(type) {
+			case string:
+				vlanVal = v
+			case int:
+				vlanVal = strconv.Itoa(v)
+			case int64:
+				vlanVal = strconv.FormatInt(v, 10)
+			case float64:
+				// YAML numbers may be decoded as float64
+				vlanVal = strconv.FormatInt(int64(v), 10)
+			default:
+				vlanVal = fmt.Sprintf("%v", v)
+			}
+			// Accept numeric VLANs like "1000" or the full URI "vlan://1000".
+			// If the value already contains a scheme ("://"), trust it
+			// (supports vlan://, vxlan://, etc.). Only numeric values
+			// without a scheme get prefixed with "vlan://".
+			if vlanVal != "" {
+				if !strings.Contains(vlanVal, "://") {
+					if _, err := strconv.Atoi(vlanVal); err == nil {
+						vlanVal = "vlan://" + vlanVal
+					}
+				}
+				createParams.SetVlan(vlanVal)
+			}
+		}
 		resp, err := client.Network.CreateNetwork(createParams)
 		if err != nil {
 			return fmt.Errorf("cloudstack create network error: %w", err)

pkg/handlers/network.go

@@ -76,6 +76,29 @@ func ResolveDiskOffering(name string) (string, error) {
 	return resp.DiskOfferings[0].Id, nil
 }
 
+// ResolveNetworkOffering returns the network offering ID for a given name.
+func ResolveNetworkOffering(name string) (string, error) {
+	// If the value looks like a UUID, treat it as an ID and return it.
+	if IsUUID(name) {
+		return name, nil
+	}
+
+	client, err := cloudstack.NewClient()
+	if err != nil {
+		return "", fmt.Errorf("failed to create CloudStack client: %w", err)
+	}
+	params := client.NetworkOffering.NewListNetworkOfferingsParams()
+	params.SetName(name)
+	resp, err := client.NetworkOffering.ListNetworkOfferings(params)
+	if err != nil {
+		return "", fmt.Errorf("cloudstack API error: %w", err)
+	}
+	if resp == nil || len(resp.NetworkOfferings) == 0 {
+		return "", fmt.Errorf("network offering %s not found", name)
+	}
+	return resp.NetworkOfferings[0].Id, nil
+}
+
 // ResolveProject returns the CloudStack project ID for a given project name.
 func ResolveProject(name string) (string, error) {
 	// If the value looks like a UUID, treat it as an ID and return it.