Merge pull request #774 from andyzhangx/getsubnet-fix

fix: getSubnetResourceID issue when subnetName is specified

Author: andyzhangx

pkg/blob/blob.go

@@ -734,18 +734,27 @@ func (d *Driver) GetStorageAccountFromSecret(secretName, secretNamespace string)
 }
 
 // getSubnetResourceID get default subnet resource ID from cloud provider config
-func (d *Driver) getSubnetResourceID() string {
+func (d *Driver) getSubnetResourceID(vnetResourceGroup, vnetName, subnetName string) string {
 	subsID := d.cloud.SubscriptionID
 	if len(d.cloud.NetworkResourceSubscriptionID) > 0 {
 		subsID = d.cloud.NetworkResourceSubscriptionID
 	}
 
-	rg := d.cloud.ResourceGroup
-	if len(d.cloud.VnetResourceGroup) > 0 {
-		rg = d.cloud.VnetResourceGroup
+	if len(vnetResourceGroup) == 0 {
+		vnetResourceGroup = d.cloud.ResourceGroup
+		if len(d.cloud.VnetResourceGroup) > 0 {
+			vnetResourceGroup = d.cloud.VnetResourceGroup
+		}
+	}
+
+	if len(vnetName) == 0 {
+		vnetName = d.cloud.VnetName
 	}
 
-	return fmt.Sprintf(subnetTemplate, subsID, rg, d.cloud.VnetName, d.cloud.SubnetName)
+	if len(subnetName) == 0 {
+		subnetName = d.cloud.SubnetName
+	}
+	return fmt.Sprintf(subnetTemplate, subsID, vnetResourceGroup, vnetName, subnetName)
 }
 
 func (d *Driver) useDataPlaneAPI(volumeID, accountName string) bool {

pkg/blob/blob_test.go

@@ -1121,7 +1121,7 @@ func TestGetSubnetResourceID(t *testing.T) {
 				d.cloud.NetworkResourceSubscriptionID = ""
 				d.cloud.ResourceGroup = "foo"
 				d.cloud.VnetResourceGroup = "foo"
-				actualOutput := d.getSubnetResourceID()
+				actualOutput := d.getSubnetResourceID("", "", "")
 				expectedOutput := fmt.Sprintf(subnetTemplate, d.cloud.SubscriptionID, "foo", d.cloud.VnetName, d.cloud.SubnetName)
 				assert.Equal(t, actualOutput, expectedOutput, "cloud.SubscriptionID should be used as the SubID")
 			},
@@ -1135,7 +1135,7 @@ func TestGetSubnetResourceID(t *testing.T) {
 				d.cloud.NetworkResourceSubscriptionID = "fakeNetSubID"
 				d.cloud.ResourceGroup = "foo"
 				d.cloud.VnetResourceGroup = "foo"
-				actualOutput := d.getSubnetResourceID()
+				actualOutput := d.getSubnetResourceID("", "", "")
 				expectedOutput := fmt.Sprintf(subnetTemplate, d.cloud.NetworkResourceSubscriptionID, "foo", d.cloud.VnetName, d.cloud.SubnetName)
 				assert.Equal(t, actualOutput, expectedOutput, "cloud.NetworkResourceSubscriptionID should be used as the SubID")
 			},
@@ -1149,7 +1149,7 @@ func TestGetSubnetResourceID(t *testing.T) {
 				d.cloud.NetworkResourceSubscriptionID = "bar"
 				d.cloud.ResourceGroup = "fakeResourceGroup"
 				d.cloud.VnetResourceGroup = ""
-				actualOutput := d.getSubnetResourceID()
+				actualOutput := d.getSubnetResourceID("", "", "")
 				expectedOutput := fmt.Sprintf(subnetTemplate, "bar", d.cloud.ResourceGroup, d.cloud.VnetName, d.cloud.SubnetName)
 				assert.Equal(t, actualOutput, expectedOutput, "cloud.Resourcegroup should be used as the rg")
 			},
@@ -1163,11 +1163,25 @@ func TestGetSubnetResourceID(t *testing.T) {
 				d.cloud.NetworkResourceSubscriptionID = "bar"
 				d.cloud.ResourceGroup = "fakeResourceGroup"
 				d.cloud.VnetResourceGroup = "fakeVnetResourceGroup"
-				actualOutput := d.getSubnetResourceID()
+				actualOutput := d.getSubnetResourceID("", "", "")
 				expectedOutput := fmt.Sprintf(subnetTemplate, "bar", d.cloud.VnetResourceGroup, d.cloud.VnetName, d.cloud.SubnetName)
 				assert.Equal(t, actualOutput, expectedOutput, "cloud.VnetResourceGroup should be used as the rg")
 			},
 		},
+		{
+			name: "VnetResourceGroup, vnetName, subnetName is specified",
+			testFunc: func(t *testing.T) {
+				d := NewFakeDriver()
+				d.cloud = &azure.Cloud{}
+				d.cloud.SubscriptionID = "bar"
+				d.cloud.NetworkResourceSubscriptionID = "bar"
+				d.cloud.ResourceGroup = "fakeResourceGroup"
+				d.cloud.VnetResourceGroup = "fakeVnetResourceGroup"
+				actualOutput := d.getSubnetResourceID("vnetrg", "vnetName", "subnetName")
+				expectedOutput := fmt.Sprintf(subnetTemplate, "bar", "vnetrg", "vnetName", "subnetName")
+				assert.Equal(t, actualOutput, expectedOutput, "VnetResourceGroup, vnetName, subnetName is specified")
+			},
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, tc.testFunc)

pkg/blob/controllerserver.go

@@ -205,7 +205,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		isHnsEnabled = to.BoolPtr(true)
 		enableNfsV3 = to.BoolPtr(true)
 		// set VirtualNetworkResourceIDs for storage account firewall setting
-		vnetResourceID := d.getSubnetResourceID()
+		vnetResourceID := d.getSubnetResourceID(vnetResourceGroup, vnetName, subnetName)
 		klog.V(2).Infof("set vnetResourceID(%s) for NFS protocol", vnetResourceID)
 		vnetResourceIDs = []string{vnetResourceID}
 		if err := d.updateSubnetServiceEndpoints(ctx, vnetResourceGroup, vnetName, subnetName); err != nil {