tormakris/edgecloudsim
4
0
Fork 0
Code Pull Requests Releases Activity

modification on reading settings from config file

Browse Source 
1- simulation scenarios are defined in config file instead of static
enumarations
2- defining multiple edge orchestrator policy in config file support is
added
This commit is contained in:
Cagatay Sonmez
2017-02-25 15:10:13 +03:00
parent 19c4b9de40
commit 81fed10dd0
9 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/edu/boun/edgecloudsim/edge_orchestrator/BasicEdgeOrchestrator.java
View File

@@ -18,7 +18,6 @@ import org.cloudbus.cloudsim.core.CloudSim;
import edu.boun.edgecloudsim.core.SimManager;
import edu.boun.edgecloudsim.core.SimSettings;
import edu.boun.edgecloudsim.core.SimSettings.SCENARIO_TYPES;
import edu.boun.edgecloudsim.edge_server.EdgeVM;
import edu.boun.edgecloudsim.edge_client.CpuUtilizationModel_Custom;
import edu.boun.edgecloudsim.edge_client.Task;
@@ -30,8 +29,7 @@ public class BasicEdgeOrchestrator extends EdgeOrchestrator {
private int lastSelectedHostIndex; //used by load balancer
private int[] lastSelectedVmIndexes; //used by each host individually
public BasicEdgeOrchestrator(String _policy,
SCENARIO_TYPES _simScenario) {
public BasicEdgeOrchestrator(String _policy, String _simScenario) {
super(_policy, _simScenario);
}
@@ -47,7 +45,7 @@ public class BasicEdgeOrchestrator extends EdgeOrchestrator {
@Override
public EdgeVM selectVm(Task task) {
if(simScenario == SimSettings.SCENARIO_TYPES.TWO_TIER_WITH_EO)
if(simScenario.equals("TWO_TIER_WITH_EO"))
return selectVmOnLoadBalancer(task);
else
return selectVmOnHost(task);

5
src/edu/boun/edgecloudsim/edge_orchestrator/EdgeOrchestrator.java
View File

@@ -13,15 +13,14 @@
package edu.boun.edgecloudsim.edge_orchestrator;
import edu.boun.edgecloudsim.core.SimSettings;
import edu.boun.edgecloudsim.edge_server.EdgeVM;
import edu.boun.edgecloudsim.edge_client.Task;
public abstract class EdgeOrchestrator {
protected String policy;
protected SimSettings.SCENARIO_TYPES simScenario;
protected String simScenario;
public EdgeOrchestrator(String _policy, SimSettings.SCENARIO_TYPES _simScenario){
public EdgeOrchestrator(String _policy, String _simScenario){
policy = _policy;
simScenario = _simScenario;
}