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

a) the new column for simulator_network_label b) re-enabling listener processing for SimulatorDiscoverer

This commit is contained in:
Prasanna Santhanam 2011-12-12 23:17:58 +05:30
parent dac505194c
commit f9aaa42347
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java
View File

@ -45,10 +45,12 @@ import com.cloud.dc.ClusterVO;
import com.cloud.dc.dao.ClusterDao;
import com.cloud.exception.ConnectionException;
import com.cloud.exception.DiscoveryException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.VMTemplateZoneVO;
import com.cloud.storage.dao.VMTemplateDao;
@ -261,7 +263,7 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
@Override
public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
/*
if(forRebalance)
return;
if ( Host.Type.SecondaryStorage == host.getType() ) {
@ -270,16 +272,16 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
VMTemplateHostVO vmTemplateHost = _vmTemplateHostDao.findByHostTemplate(host.getId(), tmplt.getId());
if (vmTemplateHost == null) {
vmTemplateHost = new VMTemplateHostVO(host.getId(), tmplt.getId(), new Date(), 100,
VMTemplateStorageResourceAssoc.Status.DOWNLOADED, null, null, null, null, tmplt.getUrl());
com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED, null, null, null, null, tmplt.getUrl());
_vmTemplateHostDao.persist(vmTemplateHost);
} else {
vmTemplateHost.setDownloadState(VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
vmTemplateHost.setDownloadState(com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
vmTemplateHost.setDownloadPercent(100);
_vmTemplateHostDao.update(vmTemplateHost.getId(), vmTemplateHost);
}
}
}
*/
}
@Override

4
setup/db/create-schema-simulator.sql
View File

@ -103,3 +103,7 @@ CREATE TABLE `cloud`.`mocksecurityrules` (
INDEX `i_mocksecurityrules__vmid`(`vmid`),
INDEX `i_mocksecurityrules__hostid`(`hostid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- Some alterations reqd for the simulator to work with a regular DB
ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN `simulator_network_label` varchar(255) COMMENT 'The name labels needed for identifying the simulator'