Add OVA-edge support to policy edge resource

Support import-in-create use case for OVA-created edge appliances

Signed-off-by: Kobi Samoray <kobi.samoray@broadcom.com>

Author: ksamoray

nsxt/resource_nsxt_policy_edge_transport_node.go

@@ -337,6 +337,13 @@ func resourceNsxtPolicyEdgeTransportNode() *schema.Resource {
 				ForceNew:    true,
 				Default:     "default",
 			},
+			"node_id": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				Description:   "Unique Id of the fabric node",
+				ConflictsWith: []string{"advanced_configuration", "appliance_config", "credentials", "form_factor", "management_interface", "vm_deployment_config"},
+			},
 			"advanced_configuration": getKeyValuePairListSchema(),
 			"appliance_config": {
 				Type:        schema.TypeList,
@@ -1180,6 +1187,42 @@ func getVMDeploymentConfigFromSchema(iVmDeploymentCfg interface{}) (*data.Struct
 	return nil, nil
 }
 
+func policyEdgeTransportNodePredeployedPatch(siteID, epID, etnID string, d *schema.ResourceData, m interface{}) error {
+
+	connector := getPolicyConnector(m)
+	etnClient := enforcement_points.NewEdgeTransportNodesClient(connector)
+
+	obj, err := etnClient.Get(siteID, epID, etnID)
+	if err != nil {
+		return err
+	}
+
+	description := d.Get("description").(string)
+	obj.Description = &description
+
+	displayName := d.Get("display_name").(string)
+	obj.DisplayName = &displayName
+
+	obj.Tags = getPolicyTagsFromSchema(d)
+
+	revision := int64(d.Get("revision").(int))
+	obj.Revision = &revision
+
+	failureDomainPath := d.Get("failure_domain_path").(string)
+	obj.FailureDomainPath = &failureDomainPath
+
+	hostname := d.Get("hostname").(string)
+	obj.Hostname = &hostname
+
+	switchSpec, err := getSwitchFromSchema(d.Get("switch"))
+	if err != nil {
+		return err
+	}
+	obj.SwitchSpec = switchSpec
+
+	return etnClient.Patch(siteID, epID, etnID, obj)
+}
+
 func policyEdgeTransportNodePatch(siteID, epID, etnID string, d *schema.ResourceData, m interface{}) error {
 
 	description := d.Get("description").(string)
@@ -1230,9 +1273,15 @@ func policyEdgeTransportNodePatch(siteID, epID, etnID string, d *schema.Resource
 
 func resourceNsxtPolicyEdgeTransportNodeCreate(d *schema.ResourceData, m interface{}) error {
 	connector := getPolicyConnector(m)
+
 	id := d.Get("nsx_id").(string)
+	nodeID := d.Get("node_id").(string)
 	if id == "" {
-		id = newUUID()
+		if nodeID != "" {
+			id = nodeID
+		} else {
+			id = newUUID()
+		}
 	}
 	sitePath := d.Get("site_path").(string)
 	siteID := getResourceIDFromResourcePath(sitePath, "sites")
@@ -1243,19 +1292,31 @@ func resourceNsxtPolicyEdgeTransportNodeCreate(d *schema.ResourceData, m interfa
 	if epID == "" {
 		epID = getPolicyEnforcementPoint(m)
 	}
-	exists, err := resourceNsxtPolicyEdgeTransportNodeExists(siteID, epID, id, connector)
-	if err != nil {
-		return err
-	}
-	if exists {
-		return fmt.Errorf("resource with ID %s already exists", id)
-	}
 
-	// Create the resource using PATCH
-	log.Printf("[INFO] Creating PolicyEdgeTransportNode with ID %s under site %s enforcement point %s", id, siteID, epID)
-	err = policyEdgeTransportNodePatch(siteID, epID, id, d, m)
-	if err != nil {
-		return handleCreateError("EdgeTransportNode", id, err)
+	if nodeID == "" {
+		exists, err := resourceNsxtPolicyEdgeTransportNodeExists(siteID, epID, id, connector)
+		if err != nil {
+			return err
+		}
+		if exists {
+			return fmt.Errorf("resource with ID %s already exists", id)
+		}
+
+		// Create the resource using PATCH
+		log.Printf("[INFO] Creating PolicyEdgeTransportNode with ID %s under site %s enforcement point %s", id, siteID, epID)
+		err = policyEdgeTransportNodePatch(siteID, epID, id, d, m)
+		if err != nil {
+			return handleCreateError("EdgeTransportNode", id, err)
+		}
+	} else {
+		log.Printf("Adding a pre-existing Edge appliance")
+		if id != nodeID {
+			return fmt.Errorf("cannot have both nsx_id and node_id attribute set, with different values")
+		}
+		err := policyEdgeTransportNodePredeployedPatch(siteID, epID, nodeID, d, m)
+		if err != nil {
+			return err
+		}
 	}
 
 	d.SetId(id)

website/docs/r/policy_edge_transport_node.html.markdown

@@ -75,6 +75,33 @@ data "nsxt_policy_realization_info" "info" {
 **NOTE:** `data.vsphere_network`, `data.vsphere_compute_cluster`, `data.vsphere_datastore`, `data.vsphere_host` are
 obtained using [hashicorp/vsphere](https://registry.terraform.io/providers/hashicorp/vsphere/) provider.
 
+## Example Usage, with Edge Transport Node created externally and converted into a transport node using Terraform
+```hcl
+data "nsxt_policy_edge_node" "node1" {
+  display_name = "tf_edge_node"
+}
+
+resource "nsxt_policy_edge_transport_node" "test" {
+  node_id = data.nsxt_policy_edge_node.node1.id
+
+  hostname = "test-edge-12"
+  switch {
+    overlay_transport_zone_path = data.nsxt_policy_transport_zone.overlay_tz.path
+    pnic {
+      device_name = "fp-eth0"
+      uplink_name = "uplink1"
+    }
+    uplink_host_switch_profile_path = data.nsxt_policy_uplink_host_switch_profile.uplink_host_switch_profile.path
+    tunnel_endpoint {
+      ip_assignment {
+        static_ipv4_pool = data.nsxt_policy_ip_pool.ip_pool1.path
+      }
+    }
+    vlan_transport_zone_paths = [data.nsxt_policy_transport_zone.vlan_tz.path]
+  }
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
@@ -84,6 +111,7 @@ The following arguments are supported:
 * `tag` - (Optional) A list of scope + tag pairs to associate with this resource.
 * `site_path` - (Optional) The path of the site which the Edge Transport Node belongs to. `path` field of the existing `nsxt_policy_site` can be used here. Defaults to default site path.
 * `enforcement_point` - (Optional) The ID of enforcement point under given `site_path` to manage the Edge Transport Node. Defaults to default enforcement point.
+* `node_id` - (Optional) The id of a pre-deployed Edge appliance to be converted into a Policy Edge transport node.
 * `advanced_configuration` - (Optional) Array of additional specific properties for advanced or cloud-specific deployments in key-value format.
   * `key` - (Required) Key.
   * `value` - (Required) Value.