Fixed volume creation for disaggregated ONTAP 9.17+

Author: clintonk

storage_drivers/ontap/api/ontap_rest.go

@@ -288,9 +288,10 @@ func NewRestClientFromOntapConfig(
 }
 
 var (
-	MinimumONTAPVersion        = versionutils.MustParseSemantic("9.12.1")
-	MinimumONTAPVersionDefault = versionutils.MustParseSemantic("9.15.1")
-	MinimumASAR2Version        = versionutils.MustParseSemantic("9.16.1")
+	MinimumONTAPVersion                             = versionutils.MustParseSemantic("9.12.1")
+	MinimumONTAPVersionDefault                      = versionutils.MustParseSemantic("9.15.1")
+	MinimumASAR2Version                             = versionutils.MustParseSemantic("9.16.1")
+	MinimumDisaggregatedTieringPolicyRemovedVersion = versionutils.MustParseSemantic("9.17.0")
 )
 
 func IsRESTSupported(version string) (bool, error) {
@@ -4095,9 +4096,19 @@ func (c *RestClient) EmsAutosupportLog(
 
 func (c *RestClient) TieringPolicyValue(
 	ctx context.Context,
-) string {
-	// Becase the REST API is always > ONTAP 9.5, just default to "none"
-	tieringPolicy := "none"
+) (tieringPolicy string) {
+	// Use "none" for unified ONTAP, and "" for disaggregated ONTAP.
+	tieringPolicy = "none"
+
+	parsedVersion, err := versionutils.ParseSemantic(c.OntapVersion)
+	if err != nil {
+		return
+	}
+
+	// TODO (cknight): verify this also applies to ASA r2
+	if c.disaggregated && parsedVersion.AtLeast(MinimumDisaggregatedTieringPolicyRemovedVersion) {
+		tieringPolicy = "" // An empty string prevents sending tieringPolicy when creating volumes.
+	}
 	return tieringPolicy
 }
 

storage_drivers/ontap/api/ontap_rest_test.go

@@ -3405,6 +3405,38 @@ func TestOntapREST_TieringPolicy(t *testing.T) {
 	server.Close()
 }
 
+func TestOntapREST_TieringPolicy_Disaggregated_916(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(mockResourceNotFound))
+	rs := newRestClient(server.Listener.Addr().String(), server.Client())
+	rs.disaggregated = true
+	rs.OntapVersion = "9.16.1"
+	assert.NotNil(t, rs)
+	tieringPolicy := rs.TieringPolicyValue(ctx)
+	assert.Equal(t, "none", tieringPolicy)
+	server.Close()
+}
+
+func TestOntapREST_TieringPolicy_Disaggregated_917(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(mockResourceNotFound))
+	rs := newRestClient(server.Listener.Addr().String(), server.Client())
+	rs.disaggregated = true
+	rs.OntapVersion = "9.17.0"
+	assert.NotNil(t, rs)
+	tieringPolicy := rs.TieringPolicyValue(ctx)
+	assert.Equal(t, "", tieringPolicy)
+	server.Close()
+}
+
+func TestOntapREST_TieringPolicy_InvalidVersion(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(mockResourceNotFound))
+	rs := newRestClient(server.Listener.Addr().String(), server.Client())
+	rs.OntapVersion = "invalid"
+	assert.NotNil(t, rs)
+	tieringPolicy := rs.TieringPolicyValue(ctx)
+	assert.Equal(t, "none", tieringPolicy)
+	server.Close()
+}
+
 func mockNvmeNamespaceListResponse(hasNextLink bool, w http.ResponseWriter, r *http.Request) {
 	numRecords := int64(1)
 	size := int64(1073741824)