Merge pull request #63566 from djsly/automated-cherry-pick-of-#63526-…

…upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #63526: adding support for VM name with extra Separator String

Cherry pick of #63526 on release-1.10.

#63526: adding support for VM name with extra Separator String

pkg/cloudprovider/providers/azure/azure_vmss_cache.go

@@ -47,13 +47,19 @@ func (ss *scaleSet) makeVmssVMName(scaleSetName, instanceID string) string {
 }
 
 func extractVmssVMName(name string) (string, string, error) {
-	ret := strings.Split(name, vmssNameSeparator)
-	if len(ret) != 2 {
+	split := strings.SplitAfter(name, vmssNameSeparator)
+	if len(split) < 2 {
 		glog.Errorf("Failed to extract vmssVMName %q", name)
 		return "", "", ErrorNotVmssInstance
 	}
 
-	return ret[0], ret[1], nil
+	ssName := strings.Join(split[0:len(split)-1], "")
+	// removing the trailing `vmssNameSeparator` since we used SplitAfter
+	ssName = ssName[:len(ssName)-1]
+
+	instanceID := split[len(split)-1]
+
+	return ssName, instanceID, nil
 }
 
 func (ss *scaleSet) newVmssCache() (*timedCache, error) {

pkg/cloudprovider/providers/azure/azure_vmss_cache_test.go

@@ -46,6 +46,12 @@ func TestExtractVmssVMName(t *testing.T) {
 			expectedScaleSet:   "vm",
 			expectedInstanceID: "1234",
 		},
+		{
+			description:        "correct vmss VM name with Extra Separator should return correct scaleSet and instanceID",
+			vmName:             "vm_test_1234",
+			expectedScaleSet:   "vm_test",
+			expectedInstanceID: "1234",
+		},
 	}
 
 	for _, c := range cases {