From 98307bfcea54c0ea7633d28598c5ffc25927169a Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Thu, 1 May 2014 15:40:04 -0700 Subject: [PATCH] CLOUDSTACK-6647: appending instance name with custom supplied info that contains - character can break vmsync. --- api/src/com/cloud/vm/VirtualMachineName.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/api/src/com/cloud/vm/VirtualMachineName.java b/api/src/com/cloud/vm/VirtualMachineName.java index 4bbcb64ebca..e6c2fbaab1b 100755 --- a/api/src/com/cloud/vm/VirtualMachineName.java +++ b/api/src/com/cloud/vm/VirtualMachineName.java @@ -18,8 +18,6 @@ package com.cloud.vm; import java.util.Formatter; -import com.cloud.dc.Vlan; - /** * VM Name. */ @@ -52,8 +50,8 @@ public class VirtualMachineName { public static boolean isValidVmName(String vmName, String instance) { String[] tokens = vmName.split(SEPARATOR); - /*Some vms doesn't have vlan/vnet id*/ - if (tokens.length != 5 && tokens.length != 4) { + + if (tokens.length <= 1) { return false; } @@ -61,17 +59,7 @@ public class VirtualMachineName { return false; } - try { - Long.parseLong(tokens[1]); - Long.parseLong(tokens[2]); - if (tokens.length == 5 && !Vlan.UNTAGGED.equalsIgnoreCase(tokens[4])) { - Long.parseLong(tokens[4], 16); - } - } catch (NumberFormatException e) { - return false; - } - - return instance == null || instance.equals(tokens[3]); + return true; } public static String getVmName(long vmId, long userId, String instance) {