fix: change controllerKey and unitNumber to *int32 (#3880)

skogta · web-flow · commit 5ef2d64275e2 · 2025-10-07T23:24:40.000-04:00
Signed-off-by: Saloni Kogta &lt;saloni.kogta@broadcom.com&gt;
diff --git a/cns/client_test.go b/cns/client_test.go
@@ -1251,6 +1251,8 @@ func TestClient(t *testing.T) {
 	t.Logf("Volume detached successfully")
 
 	if run_shared_disk_tests_tests == "true" && isvSphereVersion91orAbove {
+		t.Logf("Running shared disk tests")
+
 		// Test AttachVolume API with multiwriter parameters
 		var cnsVolumeAttachSpecList []cnstypes.CnsVolumeAttachDetachSpec
 		cnsVolumeAttachSpec := cnstypes.CnsVolumeAttachDetachSpec{
@@ -1260,8 +1262,8 @@ func TestClient(t *testing.T) {
 			Vm:            nodeVM.Reference(),
 			DiskMode:      "independent_persistent",
 			Sharing:       "sharingMultiWriter",
-			UnitNumber:    23,
-			ControllerKey: 1000,
+			UnitNumber:    vim25types.NewInt32(23),
+			ControllerKey: vim25types.NewInt32(1002),
 		}
 
 		cnsVolumeAttachSpecList = append(cnsVolumeAttachSpecList, cnsVolumeAttachSpec)
diff --git a/cns/types/types.go b/cns/types/types.go
@@ -218,8 +218,8 @@ type CnsVolumeAttachDetachSpec struct {
 	Vm            types.ManagedObjectReference `xml:"vm" json:"vm"`
 	DiskMode      string                       `xml:"diskMode,omitempty" json:"diskMode"`
 	Sharing       string                       `xml:"sharing,omitempty" json:"sharing"`
-	ControllerKey int64                        `xml:"controllerKey,omitempty" json:"controllerKey"`
-	UnitNumber    int64                        `xml:"unitNumber,omitempty" json:"unitNumber"`
+	ControllerKey *int32                       `xml:"controllerKey,omitempty" json:"controllerKey"`
+	UnitNumber    *int32                       `xml:"unitNumber,omitempty" json:"unitNumber"`
 }
 
 func init() {
@@ -480,12 +480,12 @@ func init() {
 // CnsKubernetesQueryFilter enables querying CNS volumes using Kubernetes metadata such as
 // namespaces, pod names, PVC names, and PV names.
 //
-// - Values in the PodNames, PvcNames, and PvNames lists are treated as OR conditions.
-// - Values in the Namespaces list are also treated as OR conditions.
-// - When PodNames, PvcNames, or PvNames are specified along with Namespaces,
-//   the filter applies an AND condition — i.e., the pod, PVC must belong to the specified namespace.
-// - When only Namespaces are provided (without any pod, PVC names),
-//   all volumes associated with those namespaces will be returned.
+//   - Values in the PodNames, PvcNames, and PvNames lists are treated as OR conditions.
+//   - Values in the Namespaces list are also treated as OR conditions.
+//   - When PodNames, PvcNames, or PvNames are specified along with Namespaces,
+//     the filter applies an AND condition — i.e., the pod, PVC must belong to the specified namespace.
+//   - When only Namespaces are provided (without any pod, PVC names),
+//     all volumes associated with those namespaces will be returned.
 //
 // This allows flexible volume queries such as:
 // - Listing all volumes in one or more namespaces.
