feat(gaudi-3):fixed review comments

shreyasms07 · shreyasms07 · commit 7f8723286526 · 2025-10-06T10:18:33.000+05:30
diff --git a/common/github.com/IBM/vpc-go-sdk/go.mod b/common/github.com/IBM/vpc-go-sdk/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/IBM/go-sdk-core/v5 v5.21.0
 	github.com/go-openapi/strfmt v0.23.0
 	github.com/google/uuid v1.6.0
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.1
 )
 
 require (
diff --git a/common/github.com/IBM/vpc-go-sdk/go.sum b/common/github.com/IBM/vpc-go-sdk/go.sum
@@ -68,6 +68,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
 go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
 go.mongodb.org/mongo-driver v1.17.2 h1:gvZyk8352qSfzyZ2UMWcpDpMSGEr1eqE4T793SqyhzM=
diff --git a/common/github.com/IBM/vpc-go-sdk/vpcv1/vpc_v1.go b/common/github.com/IBM/vpc-go-sdk/vpcv1/vpc_v1.go
diff --git a/go.mod b/go.mod
@@ -59,7 +59,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rook/rook/pkg/apis v0.0.0-20250619203122-80563e28b685
 	github.com/softlayer/softlayer-go v1.0.3
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.1
 	golang.org/x/crypto v0.38.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools v2.2.0+incompatible
diff --git a/go.sum b/go.sum
@@ -1174,8 +1174,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
diff --git a/ibm/service/vpc/data_source_ibm_is_cluster_network_profiles.go b/ibm/service/vpc/data_source_ibm_is_cluster_network_profiles.go
@@ -111,7 +111,7 @@ func DataSourceIBMIsClusterNetworkProfiles() *schema.Resource {
 							},
 						},
 						"isolation_group_count": &schema.Schema{
-							Type:        schema.TypeInt,
+							Type:        schema.TypeList,
 							Computed:    true,
 							Description: "The number of isolation groups supported by this cluster network profile.",
 							Elem: &schema.Resource{
@@ -243,7 +243,7 @@ func DataSourceIBMIsClusterNetworkProfilesClusterNetworkProfileToMap(model *vpcv
 		if err != nil {
 			return modelMap, err
 		}
-		modelMap["subnet_routing_supported"] = []map[string]interface{}{isolationGC}
+		modelMap["isolation_group_count"] = []map[string]interface{}{isolationGC}
 	}
 
 	zones := []map[string]interface{}{}
diff --git a/ibm/service/vpc/data_source_ibm_is_instance_profile.go b/ibm/service/vpc/data_source_ibm_is_instance_profile.go
@@ -1321,17 +1321,17 @@ func dataSourceInstanceProfileFlattenClusterNetworkAttachmentIsolationPolicy(res
 	return finalList
 }
 
-func dataSourceInstanceProfileClusterNetworkAttachmentIsolationPolicyToMap(vcpuArchitectureItem vpcv1.InstanceProfileClusterNetworkAttachmentIsolationPolicy) (vcpuArchitectureMap map[string]interface{}) {
-	vcpuArchitectureMap = map[string]interface{}{}
+func dataSourceInstanceProfileClusterNetworkAttachmentIsolationPolicyToMap(clusterNetworkAttachmentCountPolicy vpcv1.InstanceProfileClusterNetworkAttachmentIsolationPolicy) (clusterNetworkAttachmentCountPolicyMap map[string]interface{}) {
+	clusterNetworkAttachmentCountPolicyMap = map[string]interface{}{}
 
-	if vcpuArchitectureItem.Type != nil {
-		vcpuArchitectureMap["type"] = vcpuArchitectureItem.Type
+	if clusterNetworkAttachmentCountPolicy.Type != nil {
+		clusterNetworkAttachmentCountPolicyMap["type"] = clusterNetworkAttachmentCountPolicy.Type
 	}
-	if vcpuArchitectureItem.Value != nil {
-		vcpuArchitectureMap["value"] = vcpuArchitectureItem.Value
+	if clusterNetworkAttachmentCountPolicy.Value != nil {
+		clusterNetworkAttachmentCountPolicyMap["value"] = clusterNetworkAttachmentCountPolicy.Value
 	}
 
-	return vcpuArchitectureMap
+	return clusterNetworkAttachmentCountPolicyMap
 }
 
 /* Changes for the AMD Support VCPU Manufacturer */
diff --git a/ibm/service/vpc/data_source_ibm_is_instance_profiles.go b/ibm/service/vpc/data_source_ibm_is_instance_profiles.go
@@ -875,7 +875,7 @@ func instanceProfilesList(context context.Context, d *schema.ResourceData, meta
 			clusterNetworkAttachmentIsolationPolicy := profile.ClusterNetworkAttachmentIsolationPolicy.(*vpcv1.InstanceProfileClusterNetworkAttachmentIsolationPolicy)
 			clusterNetworkAttachmentIsolationPolicyMap := dataSourceInstanceProfileClusterNetworkAttachmentIsolationPolicyToMap(*clusterNetworkAttachmentIsolationPolicy)
 			clusterNetworkAttachmentIsolationPolicyList = append(clusterNetworkAttachmentIsolationPolicyList, clusterNetworkAttachmentIsolationPolicyMap)
-			l["vcpu_architecture"] = clusterNetworkAttachmentIsolationPolicyList
+			l["cluster_network_attachment_isolation_policy"] = clusterNetworkAttachmentIsolationPolicyList
 		}
 
 		if profile.GpuCount != nil {
diff --git a/ibm/service/vpc/resource_ibm_is_cluster_network_subnet.go b/ibm/service/vpc/resource_ibm_is_cluster_network_subnet.go
@@ -79,6 +79,7 @@ func ResourceIBMIsClusterNetworkSubnet() *schema.Resource {
 			"isolation_group": &schema.Schema{
 				Type:        schema.TypeInt,
 				Optional:    true,
+				Computed:    true,
 				Description: "The isolation group for the cluster network subnet.The value will not be greater than the cluster network profile's isolation_group_count.",
 			},
 			"href": &schema.Schema{
@@ -414,7 +415,7 @@ func ResourceIBMIsClusterNetworkSubnetMapToClusterNetworkSubnetPrototype(modelMa
 		model.Name = core.StringPtr(modelMap["name"].(string))
 	}
 	if modelMap["isolation_group"] != nil && modelMap["isolation_group"].(string) != "" {
-		model.Name = core.StringPtr(modelMap["isolation_group"].(string))
+		model.IsolationGroup = core.Int64Ptr(int64(modelMap["isolation_group"].(int)))
 	}
 	if modelMap["total_ipv4_address_count"] != nil {
 		model.TotalIpv4AddressCount = core.Int64Ptr(int64(modelMap["total_ipv4_address_count"].(int)))
diff --git a/ibm/service/vpc/resource_ibm_is_cluster_network_subnet_test.go b/ibm/service/vpc/resource_ibm_is_cluster_network_subnet_test.go
@@ -21,13 +21,14 @@ func TestAccIBMIsClusterNetworkSubnetBasic(t *testing.T) {
 	var conf vpcv1.ClusterNetworkSubnet
 	vpcname := fmt.Sprintf("tf-vpc-%d", acctest.RandIntRange(10, 100))
 	totalipv4addresscount := int64(64)
+	isolationGroup := int64(64)
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { acc.TestAccPreCheck(t) },
 		Providers:    acc.TestAccProviders,
 		CheckDestroy: testAccCheckIBMIsClusterNetworkSubnetDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccCheckIBMIsClusterNetworkSubnetConfigBasic(vpcname, totalipv4addresscount),
+				Config: testAccCheckIBMIsClusterNetworkSubnetConfigBasic(vpcname, totalipv4addresscount, isolationGroup),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckIBMIsClusterNetworkSubnetExists("ibm_is_cluster_network_subnet.is_cluster_network_subnet_instance", conf),
 					resource.TestCheckResourceAttr("ibm_is_vpc.is_vpc", "name", vpcname),
@@ -142,7 +143,7 @@ func TestAccIBMIsClusterNetworkSubnetBasicAllArgs(t *testing.T) {
 	})
 }
 
-func testAccCheckIBMIsClusterNetworkSubnetConfigBasic(vpcname string, totalipv4addresscount int64) string {
+func testAccCheckIBMIsClusterNetworkSubnetConfigBasic(vpcname string, totalipv4addresscount int64, isolationGroup int64) string {
 	return fmt.Sprintf(`
 		resource "ibm_is_vpc" "is_vpc" {
   			name = "%s"
@@ -159,7 +160,7 @@ func testAccCheckIBMIsClusterNetworkSubnetConfigBasic(vpcname string, totalipv4a
 			total_ipv4_address_count = %d
 			isolation_group = %d
 		}
-	`, vpcname, acc.ISClusterNetworkProfileName, acc.ISZoneName, totalipv4addresscount)
+	`, vpcname, acc.ISClusterNetworkProfileName, acc.ISZoneName, totalipv4addresscount, isolationGroup)
 }
 
 func testAccCheckIBMIsClusterNetworkSubnetConfig(vpcname, subnetname1, subnetname2 string, totalIpv4AddressCount int64) string {
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -58,7 +58,7 @@ gox \
     -arch="${XC_ARCH}" \
     -osarch="${XC_EXCLUDE_OSARCH}" \
     -ldflags "${LD_FLAGS}" \
-    -output "pkg/{{.OS}}_{{.Arch}}/terraform-provider-ibm_${VERSION}_{{.OS}}_{{.Arch}}" \
+    -output "pkg/{{.OS}}_{{.Arch}}/terraform-provider-ibm" \
     .
 
 # Move all the compiled things to the $GOPATH/bin
@@ -92,7 +92,6 @@ if [ "${TF_DEV}x" = "x" ]; then
     echo "==> Packaging..."
     for PLATFORM in $(find ./pkg -mindepth 1 -maxdepth 1 -type d); do
         OSARCH=$(basename ${PLATFORM})
-        ZIPNAME="terraform-provider-ibm_${VERSION}_${OSARCH}"
         echo "--> ${OSARCH}"
 
         pushd $PLATFORM >/dev/null 2>&1
diff --git a/website/docs/r/is_cluster_network_subnet.html.markdown b/website/docs/r/is_cluster_network_subnet.html.markdown
@@ -32,8 +32,8 @@ You can specify the following arguments for this resource.
 - `ipv4_cidr_block` - (Optional, String) The IPv4 range of this cluster network subnet, expressed in CIDR format.
 - `isolation_group` - (Optional, Integer) The isolation group for the cluster network subnet.The specified value must not exceed the cluster network's profile's isolation_group_count.
 - `name` - (Optional, String) The name for this cluster network subnet. The name is unique across all cluster network subnets in the cluster network.
-- `total_ipv4_address_count` - (Optional, Integer) The total number of IPv4 addresses in this cluster network subnet.Note: This is calculated as 2<sup>(32 - prefix length)
-</sup>. For example, the prefix length `/24` gives:<br> 2<sup>(32 - 24)</sup> = 2<sup>8</sup> = 256 addresses.
+- `total_ipv4_address_count` - (Optional, Integer) The total number of IPv4 addresses in this cluster network subnet.
+ Note: This is calculated as 2 <sup>(32 - prefix length)</sup>. For example, the prefix length `/24` gives:<br> 2<sup>(32 - 24)</sup> = 2<sup>8</sup> = 256 addresses.
 
 
 ## Attribute Reference

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ require (`
`8`	`8`	`github.com/IBM/go-sdk-core/v5 v5.21.0`
`9`	`9`	`github.com/go-openapi/strfmt v0.23.0`
`10`	`10`	`github.com/google/uuid v1.6.0`
`11`		`- github.com/stretchr/testify v1.10.0`
	`11`	`+ github.com/stretchr/testify v1.11.1`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -1321,17 +1321,17 @@ func dataSourceInstanceProfileFlattenClusterNetworkAttachmentIsolationPolicy(res`
`1321`	`1321`	`return finalList`
`1322`	`1322`	`}`
`1323`	`1323`
`1324`		`-func dataSourceInstanceProfileClusterNetworkAttachmentIsolationPolicyToMap(vcpuArchitectureItem vpcv1.InstanceProfileClusterNetworkAttachmentIsolationPolicy) (vcpuArchitectureMap map[string]interface{}) {`
`1325`		`- vcpuArchitectureMap = map[string]interface{}{}`
	`1324`	`+func dataSourceInstanceProfileClusterNetworkAttachmentIsolationPolicyToMap(clusterNetworkAttachmentCountPolicy vpcv1.InstanceProfileClusterNetworkAttachmentIsolationPolicy) (clusterNetworkAttachmentCountPolicyMap map[string]interface{}) {`
	`1325`	`+ clusterNetworkAttachmentCountPolicyMap = map[string]interface{}{}`
`1326`	`1326`
`1327`		`- if vcpuArchitectureItem.Type != nil {`
`1328`		`- vcpuArchitectureMap["type"] = vcpuArchitectureItem.Type`
	`1327`	`+ if clusterNetworkAttachmentCountPolicy.Type != nil {`
	`1328`	`+ clusterNetworkAttachmentCountPolicyMap["type"] = clusterNetworkAttachmentCountPolicy.Type`
`1329`	`1329`	`}`
`1330`		`- if vcpuArchitectureItem.Value != nil {`
`1331`		`- vcpuArchitectureMap["value"] = vcpuArchitectureItem.Value`
	`1330`	`+ if clusterNetworkAttachmentCountPolicy.Value != nil {`
	`1331`	`+ clusterNetworkAttachmentCountPolicyMap["value"] = clusterNetworkAttachmentCountPolicy.Value`
`1332`	`1332`	`}`
`1333`	`1333`
`1334`		`- return vcpuArchitectureMap`
	`1334`	`+ return clusterNetworkAttachmentCountPolicyMap`
`1335`	`1335`	`}`
`1336`	`1336`
`1337`	`1337`	`/* Changes for the AMD Support VCPU Manufacturer */`
Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,7 @@ func instanceProfilesList(context context.Context, d *schema.ResourceData, meta`
`875`	`875`	`clusterNetworkAttachmentIsolationPolicy := profile.ClusterNetworkAttachmentIsolationPolicy.(*vpcv1.InstanceProfileClusterNetworkAttachmentIsolationPolicy)`
`876`	`876`	`clusterNetworkAttachmentIsolationPolicyMap := dataSourceInstanceProfileClusterNetworkAttachmentIsolationPolicyToMap(*clusterNetworkAttachmentIsolationPolicy)`
`877`	`877`	`clusterNetworkAttachmentIsolationPolicyList = append(clusterNetworkAttachmentIsolationPolicyList, clusterNetworkAttachmentIsolationPolicyMap)`
`878`		`- l["vcpu_architecture"] = clusterNetworkAttachmentIsolationPolicyList`
	`878`	`+ l["cluster_network_attachment_isolation_policy"] = clusterNetworkAttachmentIsolationPolicyList`
`879`	`879`	`}`
`880`	`880`
`881`	`881`	`if profile.GpuCount != nil {`