Commit e3f7f60e authored by Kaio Oliveira's avatar Kaio Oliveira
Browse files

Fix merge

parent 5a18050d
......@@ -109,8 +109,12 @@ public class VmAllocationPolicyMigrationSlaTest {
return vm;
}
private Host createMockedHostWithIops(int id, int pesNumber, Vm vm, long availableResource, long iopsCapacity, double iopsUsage, ResourceProvisioner provisioner) {
private Host createMockedHostWithIops(int id, int pesNumber, Vm vm,
long availableResource, long iopsCapacity,
double iopsUsage, ResourceProvisioner provisioner) {
Host host = EasyMock.createMock(Host.class);
Iops iops = EasyMock.createMock(Iops.class);
EasyMock.expect(host.getId()).andReturn(id).anyTimes();
EasyMock.expect(host.getNumberOfPes()).andReturn((long) pesNumber).anyTimes();
......@@ -151,12 +155,12 @@ public class VmAllocationPolicyMigrationSlaTest {
List<Host> hosts = new ArrayList<Host>();
final int NUM_HEAVEN_HOSTS = 50;
for(int i = 0; i < NUM_HEAVEN_HOSTS; i++){
hosts.add(createMockedHost(i, 0, null, new ResourceProvisionerSimple()));
hosts.add(createMockedHostWithIops(i, 0, null, 0, 0, 0.0, new ResourceProvisionerSimple()));
System.out.println("#"+i);
}
final int NUM_HELL_HOSTS = 150;
for(int i = NUM_HEAVEN_HOSTS; i < NUM_HEAVEN_HOSTS+NUM_HELL_HOSTS; i++){
hosts.add(createMockedHost(i, 0, null, new ResourceProvisionerShared()));
hosts.add(createMockedHostWithIops(i, 0, null, 0, 0, 0.0, new ResourceProvisionerShared()));
System.out.println("*"+i);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment