Merge pull request #231 from NetApp/integration/main

Sync bitbucket and GitHub

Author: suhasbshekar

CHANGELOG.md

@@ -2,7 +2,7 @@
 NEW FEATURES: 
 * resource/cvo_azure: Supports configuration of `storage_account_network_access` while creating Azure SN and HA CVO.
 * resource/aggregate: now supports import.
-* resource/cvo_gcp: Supports configuration of `rootVolumeAggregate` during SVM creation in existing GCP HA CVO 
+* resource/cvo_gcp: Supports multi-SVM creation for GCP SN CVO and also supports configuration of `rootVolumeAggregate` during SVM creation in existing GCP HA and SN CVO. 
 * resource/cvo_azure: Supports multi-SVM creation for new and existing Azure SN and HA CVOs. 
 
 BREAKING CHANGE: (Please refer to guide website/docs/guides/27.0.0_upgrade_guide.md for guidance on upgrading to 27.0.0 version)

cloudmanager/cvo_gcp.go

@@ -219,9 +219,9 @@ func (c *Client) deleteCVOGCP(id string, isHA bool, clientID string, isSaas bool
 	return err
 }
 
-// This is used on GCP CVO HA only
-func (c *Client) addSVMtoCVO(id string, clientID string, svmName string, isSaas bool, connectorIP string, rootVolumeAggregate string) error {
-	log.Printf("addSVMtoCVO: id %s client %s svm %s rootVolumeAggregate %s", id, clientID, svmName, rootVolumeAggregate)
+// Add SVM to GCP CVO (supports both single-node and HA)
+func (c *Client) addSVMtoCVO(id string, clientID string, svmName string, isHA bool, isSaas bool, connectorIP string, rootVolumeAggregate string) error {
+	log.Printf("addSVMtoCVO: id %s client %s svm %s isHA %v rootVolumeAggregate %s", id, clientID, svmName, isHA, rootVolumeAggregate)
 
 	accessTokenResult, err := c.getAccessToken()
 	if err != nil {
@@ -230,8 +230,8 @@ func (c *Client) addSVMtoCVO(id string, clientID string, svmName string, isSaas
 	}
 	c.Token = accessTokenResult.Token
 
-	// GCP CVO SVM add and deletion only support HA
-	baseURL := getAPIRootForWorkingEnvironment(true, id) + "/svm"
+	// Base URL depends on deployment mode (single-node or HA)
+	baseURL := getAPIRootForWorkingEnvironment(isHA, id) + "/svm"
 	hostType := "CloudManagerHost"
 	if !isSaas {
 		hostType = "http://" + connectorIP
@@ -264,8 +264,9 @@ func (c *Client) addSVMtoCVO(id string, clientID string, svmName string, isSaas
 	return err
 }
 
-func (c *Client) deleteSVMfromCVO(id string, clientID string, svmName string, isSaas bool, connectorIP string) error {
-	log.Printf("deleteSVMfromCVO: id %s client %s svm %s", id, clientID, svmName)
+// Delete SVM from GCP CVO (supports both single-node and HA)
+func (c *Client) deleteSVMfromCVO(id string, clientID string, svmName string, isHA bool, isSaas bool, connectorIP string) error {
+	log.Printf("deleteSVMfromCVO: id %s client %s svm %s isHA %v", id, clientID, svmName, isHA)
 
 	accessTokenResult, err := c.getAccessToken()
 	if err != nil {
@@ -274,8 +275,8 @@ func (c *Client) deleteSVMfromCVO(id string, clientID string, svmName string, is
 	}
 	c.Token = accessTokenResult.Token
 
-	// GCP CVO SVM add and deletion only support HA
-	baseURL := getAPIRootForWorkingEnvironment(true, id)
+	// Base URL depends on deployment mode (single-node or HA)
+	baseURL := getAPIRootForWorkingEnvironment(isHA, id)
 	baseURL = fmt.Sprintf("%s/svm/%s", baseURL, svmName)
 	log.Print("\tDelete svm url: ", baseURL)
 

cloudmanager/helper.go

@@ -1280,8 +1280,8 @@ func updateCVOSVMPassword(d *schema.ResourceData, meta interface{}, clientID str
 	return nil
 }
 
-// update SVMs on GCP CVO HA
-func (c *Client) updateCVOSVMs(d *schema.ResourceData, clientID string, isSaas bool, connectorIP string) error {
+// update SVMs on GCP CVO (supports single-node and HA)
+func (c *Client) updateCVOSVMs(d *schema.ResourceData, clientID string, isHA bool, isSaas bool, connectorIP string) error {
 	id := d.Id()
 	currentSVMs, expectSVMs := d.GetChange("svm")
 	cSVMs := expandGCPSVMs(currentSVMs.(*schema.Set))
@@ -1322,7 +1322,7 @@ func (c *Client) updateCVOSVMs(d *schema.ResourceData, clientID string, isSaas b
 			j++
 		} else {
 			// add SVM
-			respErr := c.addSVMtoCVO(id, clientID, svmName, isSaas, connectorIP, rootVolAggregate)
+			respErr := c.addSVMtoCVO(id, clientID, svmName, isHA, isSaas, connectorIP, rootVolAggregate)
 			if respErr != nil {
 				log.Printf("Error adding SVM %v: %v", svmName, respErr)
 				return respErr
@@ -1332,7 +1332,7 @@ func (c *Client) updateCVOSVMs(d *schema.ResourceData, clientID string, isSaas b
 	if len(currentList) > 0 {
 		for _, svmName := range currentList {
 			// delete SVM
-			respErr := c.deleteSVMfromCVO(id, clientID, svmName, isSaas, connectorIP)
+			respErr := c.deleteSVMfromCVO(id, clientID, svmName, isHA, isSaas, connectorIP)
 			if respErr != nil {
 				log.Printf("Error deleting SVM %v: %v", svmName, respErr)
 				return respErr

cloudmanager/resource_netapp_cloudmanager_cvo_gcp.go

@@ -654,10 +654,11 @@ func resourceCVOGCPCreate(d *schema.ResourceData, meta interface{}) error {
 		if c, ok := d.GetOk("vpc3_firewall_rule_tag_name"); ok {
 			cvoDetails.HAParams.VPC3FirewallRuleTagName = c.(string)
 		}
-		if c, ok := d.GetOk("svm"); ok {
-			svms := c.(*schema.Set)
-			svmList = expandGCPSVMs(svms)
-		}
+	}
+	// Collect additional SVMs if provided (applies to both single-node and HA)
+	if c, ok := d.GetOk("svm"); ok {
+		svms := c.(*schema.Set)
+		svmList = expandGCPSVMs(svms)
 	}
 
 	err = validateCVOGCPParams(cvoDetails)
@@ -677,9 +678,9 @@ func resourceCVOGCPCreate(d *schema.ResourceData, meta interface{}) error {
 	d.Set("writing_speed_state", res.OntapClusterProperties.WritingSpeedState)
 	log.Printf("Created cvo: %v", res)
 
-	// Add SVMs on GCP CVO HA
+	// Add SVMs (supports single-node and HA)
 	for _, svm := range svmList {
-		err := client.addSVMtoCVO(res.PublicID, clientID, svm.SvmName, isSaas, connectorIP, "")
+		err := client.addSVMtoCVO(res.PublicID, clientID, svm.SvmName, cvoDetails.IsHA, isSaas, connectorIP, "")
 		if err != nil {
 			log.Printf("Error adding SVM %v: %v", svm.SvmName, err)
 			return err
@@ -768,9 +769,9 @@ func resourceCVOGCPUpdate(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	// check if svm list changes
-	if d.Get("is_ha").(bool) && d.HasChange("svm") {
-		respErr := client.updateCVOSVMs(d, clientID, isSaas, connectorIP)
+	// check if svm list changes (supports single-node and HA)
+	if d.HasChange("svm") {
+		respErr := client.updateCVOSVMs(d, clientID, d.Get("is_ha").(bool), isSaas, connectorIP)
 		if respErr != nil {
 			return respErr
 		}