Added - Support for RDMA Network Instances

Author: Terraform Team Automation

internal/integrationtest/core_compute_cluster_test.go

@@ -80,12 +80,19 @@ func (s *CoreClusterNetworkDataSourceCrud) SetData() error {
 
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
+	if s.Res.HpcIslandId != nil {
+		s.D.Set("hpc_island_id", *s.Res.HpcIslandId)
+	}
+
 	instancePools := []interface{}{}
 	for _, item := range s.Res.InstancePools {
 		instancePools = append(instancePools, InstancePoolToMap(item))
 	}
 	s.D.Set("instance_pools", instancePools)
 
+	s.D.Set("network_block_ids", s.Res.NetworkBlockIds)
+	s.D.Set("network_block_ids", s.Res.NetworkBlockIds)
+
 	if s.Res.PlacementConfiguration != nil {
 		s.D.Set("placement_configuration", []interface{}{ClusterNetworkPlacementConfigurationDetailsToMap(s.Res.PlacementConfiguration, true)})
 	} else {

internal/service/core/core_cluster_network_data_source.go

@@ -254,6 +254,17 @@ func CoreClusterNetworkResource() *schema.Resource {
 			},
 
 			// Computed
+			"hpc_island_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"network_block_ids": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -508,12 +519,19 @@ func (s *CoreClusterNetworkResourceCrud) SetData() error {
 
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
+	if s.Res.HpcIslandId != nil {
+		s.D.Set("hpc_island_id", *s.Res.HpcIslandId)
+	}
+
 	instancePools := []interface{}{}
 	for _, item := range s.Res.InstancePools {
 		instancePools = append(instancePools, InstancePoolToMap(item))
 	}
 	s.D.Set("instance_pools", instancePools)
 
+	s.D.Set("network_block_ids", s.Res.NetworkBlockIds)
+	s.D.Set("network_block_ids", s.Res.NetworkBlockIds)
+
 	if s.Res.PlacementConfiguration != nil {
 		s.D.Set("placement_configuration", []interface{}{ClusterNetworkPlacementConfigurationDetailsToMap(s.Res.PlacementConfiguration, false)})
 	} else {
@@ -540,7 +558,6 @@ func (s *CoreClusterNetworkResourceCrud) mapToClusterNetworkPlacementConfigurati
 		tmp := availabilityDomain.(string)
 		result.AvailabilityDomain = &tmp
 	}
-
 	if primarySubnetId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "primary_subnet_id")); ok {
 		tmp := primarySubnetId.(string)
 		result.PrimarySubnetId = &tmp
@@ -573,7 +590,6 @@ func ClusterNetworkPlacementConfigurationDetailsToMap(obj *oci_core.ClusterNetwo
 	if obj.AvailabilityDomain != nil {
 		result["availability_domain"] = string(*obj.AvailabilityDomain)
 	}
-
 	if obj.PrimarySubnetId != nil {
 		result["primary_subnet_id"] = string(*obj.PrimarySubnetId)
 	}

internal/service/core/core_cluster_network_resource.go

@@ -78,6 +78,34 @@ func CoreComputeCapacityReservationResource() *schema.Resource {
 						},
 
 						// Optional
+						"cluster_config": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Computed: true,
+							MaxItems: 1,
+							MinItems: 1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+									"hpc_island_id": {
+										Type:     schema.TypeString,
+										Required: true,
+									},
+
+									// Optional
+									"network_block_ids": {
+										Type:     schema.TypeList,
+										Optional: true,
+										Computed: true,
+										Elem: &schema.Schema{
+											Type: schema.TypeString,
+										},
+									},
+
+									// Computed
+								},
+							},
+						},
 						"fault_domain": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -458,9 +486,57 @@ func (s *CoreComputeCapacityReservationResourceCrud) SetData() error {
 	return nil
 }
 
+func (s *CoreComputeCapacityReservationResourceCrud) mapToClusterConfigDetails(fieldKeyFormat string) (oci_core.ClusterConfigDetails, error) {
+	result := oci_core.ClusterConfigDetails{}
+
+	if hpcIslandId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "hpc_island_id")); ok {
+		tmp := hpcIslandId.(string)
+		result.HpcIslandId = &tmp
+	}
+
+	if networkBlockIds, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "network_block_ids")); ok {
+		interfaces := networkBlockIds.([]interface{})
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "network_block_ids")) {
+			result.NetworkBlockIds = tmp
+		}
+	}
+
+	return result, nil
+}
+
+func ClusterConfigDetailsToMap(obj *oci_core.ClusterConfigDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.HpcIslandId != nil {
+		result["hpc_island_id"] = string(*obj.HpcIslandId)
+	}
+
+	result["network_block_ids"] = obj.NetworkBlockIds
+	result["network_block_ids"] = obj.NetworkBlockIds
+
+	return result
+}
+
 func (s *CoreComputeCapacityReservationResourceCrud) mapToInstanceReservationConfigDetails(fieldKeyFormat string) (oci_core.InstanceReservationConfigDetails, error) {
 	result := oci_core.InstanceReservationConfigDetails{}
 
+	if clusterConfig, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "cluster_config")); ok {
+		if tmpList := clusterConfig.([]interface{}); len(tmpList) > 0 {
+			fieldKeyFormatNextLevel := fmt.Sprintf("%s.%d.%%s", fmt.Sprintf(fieldKeyFormat, "cluster_config"), 0)
+			tmp, err := s.mapToClusterConfigDetails(fieldKeyFormatNextLevel)
+			if err != nil {
+				return result, fmt.Errorf("unable to convert cluster_config, encountered error: %v", err)
+			}
+			result.ClusterConfig = &tmp
+		}
+	}
+
 	if faultDomain, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "fault_domain")); ok {
 		tmp := faultDomain.(string)
 		if tmp != "" {
@@ -499,6 +575,10 @@ func (s *CoreComputeCapacityReservationResourceCrud) mapToInstanceReservationCon
 func InstanceReservationConfigToMap(obj oci_core.InstanceReservationConfig) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	if obj.ClusterConfig != nil {
+		result["cluster_config"] = []interface{}{ClusterConfigDetailsToMap(obj.ClusterConfig)}
+	}
+
 	if obj.FaultDomain != nil {
 		result["fault_domain"] = string(*obj.FaultDomain)
 	}

internal/service/core/core_compute_capacity_reservation_resource.go

@@ -0,0 +1,94 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package core
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oci_core "github.com/oracle/oci-go-sdk/v65/core"
+
+	"github.com/oracle/terraform-provider-oci/internal/client"
+	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+)
+
+func CoreComputeClusterDataSource() *schema.Resource {
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["compute_cluster_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	return tfresource.GetSingularDataSourceItemSchema(CoreComputeClusterResource(), fieldMap, readSingularCoreComputeCluster)
+}
+
+func readSingularCoreComputeCluster(d *schema.ResourceData, m interface{}) error {
+	sync := &CoreComputeClusterDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).ComputeClient()
+
+	return tfresource.ReadResource(sync)
+}
+
+type CoreComputeClusterDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_core.ComputeClient
+	Res    *oci_core.GetComputeClusterResponse
+}
+
+func (s *CoreComputeClusterDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *CoreComputeClusterDataSourceCrud) Get() error {
+	request := oci_core.GetComputeClusterRequest{}
+
+	if computeClusterId, ok := s.D.GetOkExists("compute_cluster_id"); ok {
+		tmp := computeClusterId.(string)
+		request.ComputeClusterId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "core")
+
+	response, err := s.Client.GetComputeCluster(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *CoreComputeClusterDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	if s.Res.AvailabilityDomain != nil {
+		s.D.Set("availability_domain", *s.Res.AvailabilityDomain)
+	}
+
+	if s.Res.CompartmentId != nil {
+		s.D.Set("compartment_id", *s.Res.CompartmentId)
+	}
+
+	if s.Res.DefinedTags != nil {
+		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
+	}
+
+	if s.Res.DisplayName != nil {
+		s.D.Set("display_name", *s.Res.DisplayName)
+	}
+
+	s.D.Set("freeform_tags", s.Res.FreeformTags)
+
+	s.D.Set("state", s.Res.LifecycleState)
+
+	if s.Res.TimeCreated != nil {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
+
+	return nil
+}