git commit -m "Fix compilation"

Author: jean

cloudstack/resource_cloudstack_service_offering.go

@@ -17,11 +17,11 @@
 // under the License.
 //
 
-
 package cloudstack
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -436,15 +436,6 @@ func resourceCloudStackServiceOffering() *schema.Resource {
 				Optional:    true,
 				Computed:    true,
 			},
-			"service_offering_details": {
-				Description: "Service offering details for GPU configuration and other advanced settings",
-				Type:        schema.TypeMap,
-				Optional:    true,
-				ForceNew:    true,
-				Elem: &schema.Schema{
-					Type: schema.TypeString,
-				},
-			},
 		},
 	}
 }
@@ -584,14 +575,6 @@ func resourceCloudStackServiceOfferingCreate(d *schema.ResourceData, meta interf
 		p.SetTags(v.(string))
 	}
 
-<<<<<<< HEAD
-	if v, ok := d.GetOk("domain_id"); ok {
-		domains := make([]string, 0)
-		for _, d := range v.([]interface{}) {
-			domains = append(domains, d.(string))
-		}
-		p.SetDomainid(domains)
-=======
 	if details, ok := d.GetOk("service_offering_details"); ok {
 		serviceOfferingDetails := make(map[string]string)
 		for k, v := range details.(map[string]interface{}) {
@@ -600,14 +583,6 @@ func resourceCloudStackServiceOfferingCreate(d *schema.ResourceData, meta interf
 		p.SetServiceofferingdetails(serviceOfferingDetails)
 	}
 
-	log.Printf("[DEBUG] Creating Service Offering %s", name)
-	s, err := cs.ServiceOffering.CreateServiceOffering(p)
-
-	if err != nil {
-		return err
->>>>>>> origin/main
-	}
-
 	if v, ok := d.GetOk("zone_id"); ok {
 		zones := make([]string, 0)
 		for _, z := range v.([]interface{}) {
@@ -759,33 +734,6 @@ func resourceCloudStackServiceOfferingRead(d *schema.ResourceData, meta interfac
 	d.Set("host_tags", so.Hosttags)
 	d.Set("storage_type", so.Storagetype)
 
-<<<<<<< HEAD
-	// Only set customized if it was explicitly configured by user
-	// When not configured, CloudStack auto-determines based on cpu/memory presence
-	if _, ok := d.GetOkExists("customized"); ok {
-		d.Set("customized", so.Iscustomized)
-=======
-	fields := map[string]interface{}{
-		"name":                     s.Name,
-		"display_text":             s.Displaytext,
-		"cpu_number":               s.Cpunumber,
-		"cpu_speed":                s.Cpuspeed,
-		"host_tags":                s.Hosttags,
-		"limit_cpu_use":            s.Limitcpuuse,
-		"memory":                   s.Memory,
-		"offer_ha":                 s.Offerha,
-		"storage_type":             s.Storagetype,
-		"customized":               s.Iscustomized,
-		"min_cpu_number":           getIntFromDetails(s.Serviceofferingdetails, "mincpunumber"),
-		"max_cpu_number":           getIntFromDetails(s.Serviceofferingdetails, "maxcpunumber"),
-		"min_memory":               getIntFromDetails(s.Serviceofferingdetails, "minmemory"),
-		"max_memory":               getIntFromDetails(s.Serviceofferingdetails, "maxmemory"),
-		"encrypt_root":             s.Encryptroot,
-		"storage_tags":             s.Storagetags,
-		"service_offering_details": getServiceOfferingDetails(s.Serviceofferingdetails),
->>>>>>> origin/main
-	}
-
 	// Set GPU fields from dedicated response fields
 	// Use gpucardname (not gpucardid) to match what user provides in terraform config
 	if so.Gpucardname != "" {
@@ -1004,8 +952,6 @@ func resourceCloudStackServiceOfferingDelete(d *schema.ResourceData, meta interf
 
 	return nil
 }
-<<<<<<< HEAD
-=======
 
 // getIntFromDetails extracts an integer value from the service offering details map.
 func getIntFromDetails(details map[string]string, key string) interface{} {
@@ -1044,4 +990,3 @@ func getServiceOfferingDetails(details map[string]string) map[string]interface{}
 
 	return result
 }
->>>>>>> origin/main