etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

(cherry picked from commit 98307bfcea)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/com/cloud/vm/VirtualMachineName.java
This commit is contained in:
Kelven Yang 2014-05-01 15:40:04 -07:00 committed by Rohit Yadav
parent cef29cc818
commit e4a3ee1526
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/src/com/cloud/vm/VirtualMachineName.java
View File

@ -18,8 +18,6 @@ package com.cloud.vm;
import java.util.Formatter;
import com.cloud.dc.Vlan;
/**
* VM Name.
*/
@ -52,26 +50,16 @@ 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;
}
if (!tokens[0].equals("i")) {
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) {