apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup default hypervisortype

Browse Source
This commit is contained in:
Edison Su 2011-02-01 13:26:06 -05:00
parent 51894d22d2
commit 675a610995
5 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -1673,22 +1673,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
VlanType vlanType = forVirtualNetwork ? VlanType.VirtualNetwork : VlanType.DirectAttached;
//check for hypervisor type to be xenserver
String hypervisorType = _configDao.getValue("hypervisor.type");
if(hypervisorType.equalsIgnoreCase("xenserver")) {
//check for the vlan being added before going to db, to see if it is untagged
if(vlanType.toString().equalsIgnoreCase("VirtualNetwork") && vlanId.equalsIgnoreCase(Vlan.UNTAGGED))
{
if(_configDao.getValue("xen.public.network.device") == null || _configDao.getValue("xen.public.network.device").equals(""))
{
throw new CloudRuntimeException("For adding an untagged IP range, please set up xen.public.network.device");
}
}
}
//ACL check
checkAccess(account, zone);

5
server/src/com/cloud/server/ManagementServer.java
View File

@ -514,11 +514,6 @@ public interface ManagementServer extends ManagementService {
*/
SecurityGroupVO findNetworkGroupById(long networkGroupId);
/**
* Is the hypervisor snapshot capable.
* @return True if the hypervisor.type is XenServer
*/
boolean isHypervisorSnapshotCapable();
List<String> searchForStoragePoolDetails(long poolId, String value);
boolean checkLocalStorageConfigVal();

9
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -343,7 +343,6 @@ public class ManagementServerImpl implements ManagementServer {
private final Map<String, Boolean> _availableIdsMap;
private final boolean _isHypervisorSnapshotCapable = false;
private String _hashKey = null;
protected ManagementServerImpl() {
@ -4081,14 +4080,6 @@ public class ManagementServerImpl implements ManagementServer {
return groupVO;
}
/**
* {@inheritDoc}
*/
@Override
public boolean isHypervisorSnapshotCapable() {
return _isHypervisorSnapshotCapable;
}
@Override
public List<EventVO> listPendingEvents(int entryTime, int duration) {
Calendar calMin = Calendar.getInstance();

2
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
View File

@ -60,7 +60,6 @@ import com.cloud.utils.db.Transaction;
@Local(value={VMTemplateDao.class})
public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implements VMTemplateDao {
private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class);
private HypervisorType _defaultHyperType;
@Inject
VMTemplateZoneDao _templateZoneDao;
@ -241,7 +240,6 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
tmpltZoneSearch.done();
TmpltsInZoneSearch.done();
_defaultHyperType = HypervisorType.getType(_configDao.getValue("hypervisor.type"));
return result;
}

1
server/src/com/cloud/test/DatabaseConfig.java
View File

@ -341,7 +341,6 @@ public class DatabaseConfig {
s_defaultConfigurationValues.put("use.local.storage", "false");
s_defaultConfigurationValues.put("init", "false");
// s_defaultConfigurationValues.put("network.type", "vnet");
s_defaultConfigurationValues.put("hypervisor.type", "kvm");
}
protected DatabaseConfig() {