fix: imported xenorchestra_bonded_network is missing some fields #346

Author: gCyrille

docs/data-sources/pif.md

@@ -47,8 +47,12 @@ resource "xenorchestra_vm" "demo-vm" {
 ### Read-Only
 
 - `attached` (Boolean) If the PIF is attached to the network.
+- `bond_master` (String) In case of a bond slave, the uuid of the bond master.
+- `bond_slaves` (List of String) In case of a bond master, the pifs (uuid) that are used for this bond.
 - `host` (String) The host the PIF is associated with.
 - `id` (String) The ID of this resource.
+- `is_bond_master` (Boolean) True if this PIF is a bond master.
+- `is_bond_slave` (Boolean) True if this PIF is a bond slave.
 - `network` (String) The network the PIF is associated with.
 - `pool_id` (String) The pool the PIF is associated with.
 - `uuid` (String) The uuid of the PIF.

go.mod

@@ -7,7 +7,7 @@ toolchain go1.24.3
 require (
 	github.com/hashicorp/terraform-plugin-docs v0.18.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
-	github.com/vatesfr/xenorchestra-go-sdk v1.1.0
+	github.com/vatesfr/xenorchestra-go-sdk v1.1.1-0.20250519134506-c1a6ccdd55cb
 )
 
 require (

go.sum

@@ -184,8 +184,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/vatesfr/xenorchestra-go-sdk v1.1.0 h1:O7VbvBQ1rogzI5Xv8Me88CrRUGwrK/vMXT2CUmCToK0=
-github.com/vatesfr/xenorchestra-go-sdk v1.1.0/go.mod h1:3679gtr7PLytF3C9/QeF/llA0L5ZRvXfaP1oWtk7Hf4=
+github.com/vatesfr/xenorchestra-go-sdk v1.1.1-0.20250519134506-c1a6ccdd55cb h1:qHW07vFNY5N6YzfzlPMl3MOlWWykUFnt8ZFZaA8Yd80=
+github.com/vatesfr/xenorchestra-go-sdk v1.1.1-0.20250519134506-c1a6ccdd55cb/go.mod h1:3679gtr7PLytF3C9/QeF/llA0L5ZRvXfaP1oWtk7Hf4=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

xoa/data_source_xenorchestra_pif.go

@@ -57,6 +57,29 @@ Ensure that your device, vlan, host_id and other arguments identify a unique PIF
 				Required:    true,
 				Description: "The VLAN the PIF belongs to.",
 			},
+			"is_bond_master": &schema.Schema{
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "True if this PIF is a bond master.",
+			},
+			"bond_slaves": &schema.Schema{
+				Type: schema.TypeList,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Computed:    true,
+				Description: "In case of a bond master, the pifs (uuid) that are used for this bond.",
+			},
+			"is_bond_slave": &schema.Schema{
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "True if this PIF is a bond slave.",
+			},
+			"bond_master": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "In case of a bond slave, the uuid of the bond master.",
+			},
 		},
 	}
 }
@@ -95,5 +118,9 @@ func dataSourcePIFRead(d *schema.ResourceData, m interface{}) error {
 	d.Set("pool_id", pif.PoolId)
 	d.Set("network", pif.Network)
 	d.Set("vlan", pif.Vlan)
+	d.Set("bond_slaves", pif.BondSlaves)
+	d.Set("is_bond_master", pif.IsBondMaster)
+	d.Set("is_bond_slave", pif.IsBondSlave)
+	d.Set("bond_master", pif.BondMaster)
 	return nil
 }

xoa/resource_xenorchestra_bonded_network.go

@@ -18,7 +18,7 @@ func resourceXoaBondedNetwork() *schema.Resource {
 		Read:        resourceBondedNetworkRead,
 		Update:      resourceBondedNetworkUpdate,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			State: resourceBondedNetworkImport,
 		},
 		Schema: map[string]*schema.Schema{
 			"automatic": &schema.Schema{
@@ -49,12 +49,14 @@ func resourceXoaBondedNetwork() *schema.Resource {
 				},
 				Optional:    true,
 				ForceNew:    true,
+				Computed:    true,
 				Description: "The pifs (uuid) that should be used for this network.",
 			},
 			"bond_mode": &schema.Schema{
 				Type:         schema.TypeString,
 				Optional:     true,
 				ForceNew:     true,
+				Computed:     true,
 				Description:  "The bond mode that should be used for this network.",
 				ValidateFunc: validation.StringInSlice(validBondModes, false),
 			},
@@ -159,6 +161,46 @@ func resourceBondedNetworkDelete(d *schema.ResourceData, m interface{}) error {
 	return nil
 }
 
+// Custom importer to populate pif_ids from BondSlaves of the network's main PIF
+func resourceBondedNetworkImport(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	c := m.(client.XOClient)
+	network, err := c.GetNetwork(client.Network{Id: d.Id()})
+	if err != nil {
+		return nil, err
+	}
+
+	if len(network.PIFs) < 1 {
+		return nil, errors.New("network should contain one PIF")
+	}
+
+	// Get the bonded pifs and bond mode from the master pif
+	for _, pifID := range network.PIFs {
+		bondPifs, err := c.GetPIF(client.PIF{Id: pifID})
+		if err != nil {
+			return nil, err
+		}
+		if len(bondPifs) < 1 {
+			return nil, errors.New("no PIF returned for ID: %s" + pifID)
+		}
+		if bondPifs[0].IsBondMaster {
+			if err := d.Set("pif_ids", bondPifs[0].BondSlaves); err != nil {
+				return nil, err
+			}
+			bond, err := c.GetBond(client.Bond{Master: bondPifs[0].Id})
+			if err != nil {
+				return nil, err
+			}
+			d.Set("bond_mode", bond.Mode)
+			break
+		}
+	}
+
+	if err := bondedNetworkToData(network, d); err != nil {
+		return nil, err
+	}
+	return []*schema.ResourceData{d}, nil
+}
+
 func bondedNetworkToData(network *client.Network, d *schema.ResourceData) error {
 	d.SetId(network.Id)
 	if err := d.Set("name_label", network.NameLabel); err != nil {