CLOUDSTACK-6647: appending instance name with custom supplied info that contains - character can break vmsync.

kelveny · kelveny · commit 98307bfcea54 · 2014-05-12T16:32:05.000-07:00
diff --git a/api/src/com/cloud/vm/VirtualMachineName.java b/api/src/com/cloud/vm/VirtualMachineName.java
@@ -18,8 +18,6 @@
 
 import java.util.Formatter;
 
-import com.cloud.dc.Vlan;
-
 /**
  * VM Name.
  */
@@ -52,26 +50,16 @@ public static boolean isValidVmName(String vmName) {
 
     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) {
-            return false;
-        }
 
-        if (!tokens[0].equals("i")) {
+        if (tokens.length <= 1) {
             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) {
+        if (!tokens[0].equals("i")) {
             return false;
         }
 
-        return instance == null || instance.equals(tokens[3]);
+        return true;
     }
 
     public static String getVmName(long vmId, long userId, String instance) {
