You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/02/26 15:14:12 UTC
[3/36] git commit: refs/heads/qemu-img - CLOUDSTACK-778: user
provided hostname to be specified in vCenter instead of CloudStack generated
name Introducing flag to allow display name to be appended to internal
instance name.
CLOUDSTACK-778: user provided hostname to be specified in vCenter instead of CloudStack generated name
Introducing flag to allow display name to be appended to internal instance name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6675d2c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6675d2c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6675d2c1
Branch: refs/heads/qemu-img
Commit: 6675d2c1a36d0182ff1218375bc896228dd64434
Parents: 15201d9
Author: Vijayendra Bhamidipati <vi...@citrix.com>
Authored: Mon Feb 25 18:46:40 2013 +0530
Committer: Koushik Das <ko...@citrix.com>
Committed: Mon Feb 25 18:57:18 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/configuration/Config.java | 1 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 61 +++++++++++----
server/src/com/cloud/vm/dao/VMInstanceDao.java | 3 +-
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 14 +++-
setup/db/db/schema-410to420.sql | 1 +
5 files changed, 62 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6675d2c1/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 8c77715..1cea9aa 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -232,6 +232,7 @@ public enum Config {
EnableEC2API("Advanced", ManagementServer.class, Boolean.class, "enable.ec2.api", "false", "enable EC2 API on CloudStack", null),
EnableS3API("Advanced", ManagementServer.class, Boolean.class, "enable.s3.api", "false", "enable Amazon S3 API on CloudStack", null),
RecreateSystemVmEnabled("Advanced", ManagementServer.class, Boolean.class, "recreate.systemvm.enabled", "false", "If true, will recreate system vm root disk whenever starting system vm", "true,false"),
+ SetVmInternalNameUsingDisplayName("Advanced", ManagementServer.class, Boolean.class, "vm.instancename.flag", "false", "If true, will append guest VM's display Name (if set) to its internal instance name", "true,false"),
IncorrectLoginAttemptsAllowed("Advanced", ManagementServer.class, Integer.class, "incorrect.login.attempts.allowed", "5", "Incorrect login attempts allowed before the user is disabled", null),
// Ovm
OvmPublicNetwork("Hidden", ManagementServer.class, String.class, "ovm.public.network.device", null, "Specify the public bridge on host for public network", null),
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6675d2c1/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index cf9eb27..6cb3f1a 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -60,16 +60,16 @@ import com.cloud.agent.AgentManager.OnError;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.GetVmStatsAnswer;
import com.cloud.agent.api.GetVmStatsCommand;
+import com.cloud.agent.api.PlugNicAnswer;
+import com.cloud.agent.api.PlugNicCommand;
import com.cloud.agent.api.StartAnswer;
import com.cloud.agent.api.StopAnswer;
+import com.cloud.agent.api.UnPlugNicAnswer;
+import com.cloud.agent.api.UnPlugNicCommand;
import com.cloud.agent.api.VmStatsEntry;
import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.agent.api.PlugNicAnswer;
-import com.cloud.agent.api.PlugNicCommand;
-import com.cloud.agent.api.UnPlugNicAnswer;
-import com.cloud.agent.api.UnPlugNicCommand;
import com.cloud.agent.manager.Commands;
import com.cloud.alert.AlertManager;
import com.cloud.api.query.dao.UserVmJoinDao;
@@ -115,11 +115,14 @@ import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
-import com.cloud.network.*;
+import com.cloud.network.Network;
import com.cloud.network.Network.IpAddresses;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
+import com.cloud.network.NetworkManager;
+import com.cloud.network.NetworkModel;
import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.PhysicalNetwork;
import com.cloud.network.dao.FirewallRulesDao;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.IPAddressVO;
@@ -244,6 +247,7 @@ import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+
import com.cloud.vm.dao.InstanceGroupDao;
import com.cloud.vm.dao.InstanceGroupVMMapDao;
import com.cloud.vm.dao.NicDao;
@@ -252,7 +256,6 @@ import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.snapshot.VMSnapshot;
import com.cloud.vm.snapshot.VMSnapshotManager;
-//import com.cloud.vm.snapshot.VMSnapshotVO;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@Local(value = { UserVmManager.class, UserVmService.class })
@@ -408,10 +411,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
protected String _name;
protected String _instance;
protected String _zone;
+ protected boolean _instanceNameFlag;
@Inject ConfigurationDao _configDao;
private int _createprivatetemplatefromvolumewait;
private int _createprivatetemplatefromsnapshotwait;
+ private final int MAX_VM_NAME_LEN = 80;
@Inject
protected OrchestrationService _orchSrvc;
@@ -1219,6 +1224,15 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
VirtualMachine.State.getStateMachine().registerListener(
new UserVmStateListener(_usageEventDao, _networkDao, _nicDao));
+ value = _configDao.getValue(Config.SetVmInternalNameUsingDisplayName.key());
+ if(value == null) {
+ _instanceNameFlag = false;
+ }
+ else
+ {
+ _instanceNameFlag = Boolean.parseBoolean(value);
+ }
+
s_logger.info("User VM Manager is configured.");
return true;
@@ -2114,6 +2128,14 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, null, group, userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, keyboard);
}
+
+ public void checkNameForRFCCompliance(String name) {
+ if (!NetUtils.verifyDomainNameLabel(name, true)) {
+ throw new InvalidParameterValueException("Invalid name. Vm name can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
+ + "and the hyphen ('-'), must be between 1 and 63 characters long, and can't start or end with \"-\" and can't start with digit");
+ }
+ }
+
@DB @ActionEvent(eventType = EventTypes.EVENT_VM_CREATE, eventDescription = "deploying Vm", create = true)
protected UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, String hostName, String displayName, Account owner, Long diskOfferingId,
Long diskSize, List<NetworkVO> networkList, List<Long> securityGroupIdList, String group, String userData, String sshKeyPair, HypervisorType hypervisor, Account caller, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, String keyboard)
@@ -2300,8 +2322,23 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
long id = _vmDao.getNextInSequence(Long.class, "id");
- String instanceName = VirtualMachineName.getVmName(id, owner.getId(),
- _instance);
+ String instanceName;
+ if (_instanceNameFlag && displayName != null) {
+ // Check if the displayName conforms to RFC standards.
+ checkNameForRFCCompliance(displayName);
+ instanceName = VirtualMachineName.getVmName(id, owner.getId(), displayName);
+ if (instanceName.length() > MAX_VM_NAME_LEN) {
+ throw new InvalidParameterValueException("Specified display name " + displayName + " causes VM name to exceed 80 characters in length");
+ }
+ // Search whether there is already an instance with the same instance name
+ // that is not in the destroyed or expunging state.
+ VMInstanceVO vm = _vmInstanceDao.findVMByInstanceName(instanceName);
+ if (vm != null && vm.getState() != VirtualMachine.State.Expunging) {
+ throw new InvalidParameterValueException("There already exists a VM by the display name supplied");
+ }
+ } else {
+ instanceName = VirtualMachineName.getVmName(id, owner.getId(), _instance);
+ }
String uuidName = UUID.randomUUID().toString();
@@ -2309,12 +2346,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
if (hostName == null) {
hostName = uuidName;
} else {
- // 1) check is hostName is RFC complient
- if (!NetUtils.verifyDomainNameLabel(hostName, true)) {
- throw new InvalidParameterValueException(
- "Invalid name. Vm name can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
- + "and the hyphen ('-'), must be between 1 and 63 characters long, and can't start or end with \"-\" and can't start with digit");
- }
+ //1) check is hostName is RFC compliant
+ checkNameForRFCCompliance(hostName);
// 2) hostName has to be unique in the network domain
Map<String, List<Long>> ntwkDomains = new HashMap<String, List<Long>>();
for (NetworkVO network : networkList) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6675d2c1/server/src/com/cloud/vm/dao/VMInstanceDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/dao/VMInstanceDao.java b/server/src/com/cloud/vm/dao/VMInstanceDao.java
index d34b257..c604027 100644
--- a/server/src/com/cloud/vm/dao/VMInstanceDao.java
+++ b/server/src/com/cloud/vm/dao/VMInstanceDao.java
@@ -26,7 +26,6 @@ import com.cloud.utils.fsm.StateDao;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.VirtualMachine.Type;
/*
@@ -75,6 +74,8 @@ public interface VMInstanceDao extends GenericDao<VMInstanceVO, Long>, StateDao<
VMInstanceVO findByIdTypes(long id, VirtualMachine.Type... types);
+ VMInstanceVO findVMByInstanceName(String name);
+
void updateProxyId(long id, Long proxyId, Date time);
List<VMInstanceVO> listByHostIdTypes(long hostid, VirtualMachine.Type... types);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6675d2c1/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
index 531c794..7198b7c 100644
--- a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -35,12 +35,9 @@ import org.springframework.stereotype.Component;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
-import com.cloud.host.dao.HostDaoImpl;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.tags.dao.ResourceTagsDaoImpl;
import com.cloud.utils.Pair;
-
import com.cloud.utils.db.Attribute;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@@ -80,6 +77,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
protected SearchBuilder<VMInstanceVO> HostIdTypesSearch;
protected SearchBuilder<VMInstanceVO> HostIdUpTypesSearch;
protected SearchBuilder<VMInstanceVO> HostUpSearch;
+ protected SearchBuilder<VMInstanceVO> InstanceNameSearch;
protected GenericSearchBuilder<VMInstanceVO, Long> CountVirtualRoutersByAccount;
protected GenericSearchBuilder<VMInstanceVO, Long> CountRunningByHost;
protected GenericSearchBuilder<VMInstanceVO, Long> CountRunningByAccount;
@@ -188,6 +186,10 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
HostUpSearch.and("states", HostUpSearch.entity().getState(), Op.IN);
HostUpSearch.done();
+ InstanceNameSearch = createSearchBuilder();
+ InstanceNameSearch.and("instanceName", InstanceNameSearch.entity().getInstanceName(), Op.EQ);
+ InstanceNameSearch.done();
+
CountVirtualRoutersByAccount = createSearchBuilder(Long.class);
CountVirtualRoutersByAccount.select(null, Func.COUNT, null);
CountVirtualRoutersByAccount.and("account", CountVirtualRoutersByAccount.entity().getAccountId(), SearchCriteria.Op.EQ);
@@ -340,6 +342,12 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
return findOneIncludingRemovedBy(sc);
}
+ @Override
+ public VMInstanceVO findVMByInstanceName(String name) {
+ SearchCriteria<VMInstanceVO> sc = InstanceNameSearch.create();
+ sc.setParameters("instanceName", name);
+ return findOneBy(sc);
+ }
@Override
public void updateProxyId(long id, Long proxyId, Date time) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6675d2c1/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index d306237..be8e7f5 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -99,3 +99,4 @@ CREATE TABLE `vpc_service_map` (
SET foreign_key_checks = 1;
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.instancename.flag', 'false', 'Append guest VM display Name (if set) to the internal name of the VM');