Upgrade to CloudSim Plus 8.0.0

Signed-off-by: Manoel Campos <[email protected]>

Author: manoelcampos

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.cloudsimplus</groupId>
     <artifactId>cloudsim-plus-automation</artifactId>
-    <version>7.3.3</version>
+    <version>8.0.0</version>
     <packaging>jar</packaging>
 
     <name>CloudSim Plus Automation</name>

src/main/java/cloudreports/models/CustomerRegistry.java

@@ -19,8 +19,8 @@
 
 package cloudreports.models;
 
-import org.cloudbus.cloudsim.cloudlets.Cloudlet;
-import org.cloudbus.cloudsim.vms.Vm;
+import org.cloudsimplus.cloudlets.Cloudlet;
+import org.cloudsimplus.vms.Vm;
 
 import java.io.Serializable;
 import java.util.ArrayList;

src/main/java/cloudreports/models/DatacenterRegistry.java

@@ -19,11 +19,10 @@
 
 package cloudreports.models;
 
-import org.cloudbus.cloudsim.allocationpolicies.VmAllocationPolicy;
+import org.cloudsimplus.allocationpolicies.VmAllocationPolicy;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 /**

src/main/java/cloudreports/models/HostRegistry.java

@@ -19,11 +19,11 @@
 
 package cloudreports.models;
 
-import org.cloudbus.cloudsim.power.models.PowerModel;
-import org.cloudbus.cloudsim.provisioners.PeProvisioner;
-import org.cloudbus.cloudsim.provisioners.ResourceProvisioner;
-import org.cloudbus.cloudsim.resources.Bandwidth;
-import org.cloudbus.cloudsim.schedulers.vm.VmScheduler;
+import org.cloudsimplus.power.models.PowerModel;
+import org.cloudsimplus.provisioners.PeProvisioner;
+import org.cloudsimplus.provisioners.ResourceProvisioner;
+import org.cloudsimplus.resources.Bandwidth;
+import org.cloudsimplus.schedulers.vm.VmScheduler;
 
 import java.io.Serializable;
 

src/main/java/cloudreports/models/VmRegistry.java

@@ -19,8 +19,8 @@
 
 package cloudreports.models;
 
-import org.cloudbus.cloudsim.schedulers.cloudlet.CloudletScheduler;
-import org.cloudbus.cloudsim.vms.Vm;
+import org.cloudsimplus.schedulers.cloudlet.CloudletScheduler;
+import org.cloudsimplus.vms.Vm;
 
 import java.io.Serializable;
 

src/main/java/org/cloudsimplus/automation/CloudSimulation.java

@@ -24,28 +24,28 @@
 
 import ch.qos.logback.classic.Level;
 import cloudreports.models.*;
-import org.cloudbus.cloudsim.allocationpolicies.VmAllocationPolicy;
-import org.cloudbus.cloudsim.brokers.DatacenterBroker;
-import org.cloudbus.cloudsim.brokers.DatacenterBrokerSimple;
-import org.cloudbus.cloudsim.cloudlets.Cloudlet;
-import org.cloudbus.cloudsim.cloudlets.CloudletSimple;
-import org.cloudbus.cloudsim.core.CloudSim;
-import org.cloudbus.cloudsim.datacenters.Datacenter;
-import org.cloudbus.cloudsim.datacenters.DatacenterSimple;
-import org.cloudbus.cloudsim.hosts.Host;
-import org.cloudbus.cloudsim.hosts.HostSimple;
-import org.cloudbus.cloudsim.provisioners.ResourceProvisioner;
-import org.cloudbus.cloudsim.resources.DatacenterStorage;
-import org.cloudbus.cloudsim.resources.Pe;
-import org.cloudbus.cloudsim.resources.PeSimple;
-import org.cloudbus.cloudsim.resources.SanStorage;
-import org.cloudbus.cloudsim.schedulers.cloudlet.CloudletScheduler;
-import org.cloudbus.cloudsim.schedulers.vm.VmScheduler;
-import org.cloudbus.cloudsim.utilizationmodels.UtilizationModel;
-import org.cloudbus.cloudsim.vms.Vm;
-import org.cloudbus.cloudsim.vms.VmSimple;
+import org.cloudsimplus.allocationpolicies.VmAllocationPolicy;
+import org.cloudsimplus.brokers.DatacenterBroker;
+import org.cloudsimplus.brokers.DatacenterBrokerSimple;
 import org.cloudsimplus.builders.tables.CloudletsTableBuilder;
+import org.cloudsimplus.cloudlets.Cloudlet;
+import org.cloudsimplus.cloudlets.CloudletSimple;
+import org.cloudsimplus.core.CloudSimPlus;
+import org.cloudsimplus.datacenters.Datacenter;
+import org.cloudsimplus.datacenters.DatacenterSimple;
+import org.cloudsimplus.hosts.Host;
+import org.cloudsimplus.hosts.HostSimple;
+import org.cloudsimplus.provisioners.ResourceProvisioner;
+import org.cloudsimplus.resources.DatacenterStorage;
+import org.cloudsimplus.resources.Pe;
+import org.cloudsimplus.resources.PeSimple;
+import org.cloudsimplus.resources.SanStorage;
+import org.cloudsimplus.schedulers.cloudlet.CloudletScheduler;
+import org.cloudsimplus.schedulers.vm.VmScheduler;
 import org.cloudsimplus.util.Log;
+import org.cloudsimplus.utilizationmodels.UtilizationModel;
+import org.cloudsimplus.vms.Vm;
+import org.cloudsimplus.vms.VmSimple;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -62,7 +62,7 @@
  */
 public class CloudSimulation implements Runnable {
     private final YamlCloudScenario scenario;
-    private CloudSim cloudsimplus;
+    private CloudSimPlus cloudsimplus;
     private List<Datacenter> datacenters;
     private boolean showResults;
     private boolean logEnabled;
@@ -425,7 +425,7 @@ private List<Pe> createHostProcessingElements(final HostRegistry hr) {
     @Override
     public void run() {
         final double startTime = System.currentTimeMillis();
-        this.cloudsimplus = new CloudSim();
+        this.cloudsimplus = new CloudSimPlus();
         if(!logEnabled){
             Log.setLevel(Level.OFF);
         }
@@ -521,7 +521,7 @@ private int getNumCloudletsForCustomer(CustomerRegistry customer) {
      *
      * @return
      */
-    public CloudSim getCloudSimPlus() {
+    public CloudSimPlus getCloudSimPlus() {
         return cloudsimplus;
     }
 

src/main/java/org/cloudsimplus/automation/PolicyLoader.java

@@ -26,23 +26,23 @@
  */
 package org.cloudsimplus.automation;
 
+import cloudreports.models.DatacenterRegistry;
+import cloudreports.models.HostRegistry;
+import cloudreports.models.VmRegistry;
+import org.cloudsimplus.allocationpolicies.VmAllocationPolicy;
+import org.cloudsimplus.provisioners.PeProvisioner;
+import org.cloudsimplus.provisioners.ResourceProvisioner;
+import org.cloudsimplus.schedulers.cloudlet.CloudletScheduler;
+import org.cloudsimplus.schedulers.vm.VmScheduler;
+import org.cloudsimplus.utilizationmodels.UtilizationModel;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import cloudreports.models.DatacenterRegistry;
-import cloudreports.models.HostRegistry;
-import cloudreports.models.VmRegistry;
-import org.cloudbus.cloudsim.allocationpolicies.VmAllocationPolicy;
-import org.cloudbus.cloudsim.provisioners.PeProvisioner;
-import org.cloudbus.cloudsim.provisioners.ResourceProvisioner;
-import org.cloudbus.cloudsim.schedulers.cloudlet.CloudletScheduler;
-import org.cloudbus.cloudsim.schedulers.vm.VmScheduler;
-import org.cloudbus.cloudsim.utilizationmodels.UtilizationModel;
-
 /**
  * Dynamically creates instances of classes such as {@link VmScheduler}, {@link VmAllocationPolicy},
  * {@link CloudletScheduler}, {@link ResourceProvisioner} and others from the class name of
@@ -64,7 +64,7 @@ public class PolicyLoader {
     /**
      * The base CloudSim package name.
      */
-    private static final String PKG = "org.cloudbus.cloudsim";
+    private static final String PKG = "org.cloudsimplus";
 
     /**
      * Try to get a class corresponding to its full name from

src/main/java/org/cloudsimplus/automation/Start.java

@@ -24,7 +24,7 @@
 
 import com.esotericsoftware.yamlbeans.YamlException;
 import org.apache.commons.cli.*;
-import org.cloudbus.cloudsim.core.CloudSim;
+import org.cloudsimplus.core.CloudSimPlus;
 
 import java.io.FileNotFoundException;
 import java.util.regex.Matcher;
@@ -154,7 +154,7 @@ private String getFullClassFilePath() {
     public void build() {
         System.out.printf(
             "Starting %d Simulation Scenario(s) from file %s in CloudSim Plus %s\n",
-            reader.getScenarios().size(), reader.getFile(), CloudSim.VERSION);
+            reader.getScenarios().size(), reader.getFile(), CloudSimPlus.VERSION);
 
         int i = 0;
         for (YamlCloudScenario scenario : reader.getScenarios()) {

src/main/java/org/cloudsimplus/automation/examples/Example1.java

@@ -1,11 +1,11 @@
 package org.cloudsimplus.automation.examples;
 
 import com.esotericsoftware.yamlbeans.YamlException;
-import org.cloudbus.cloudsim.core.CloudSim;
-import org.cloudbus.cloudsim.util.ResourceLoader;
 import org.cloudsimplus.automation.CloudSimulation;
 import org.cloudsimplus.automation.YamlCloudScenario;
 import org.cloudsimplus.automation.YamlCloudScenarioReader;
+import org.cloudsimplus.core.CloudSimPlus;
+import org.cloudsimplus.util.ResourceLoader;
 
 import java.io.FileNotFoundException;
 import java.util.List;
@@ -19,7 +19,7 @@
  */
 public class Example1 {
     private Example1(){
-        System.out.printf("Starting %s on %s%n", getClass().getSimpleName(), CloudSim.VERSION);
+        System.out.printf("Starting %s on %s%n", getClass().getSimpleName(), CloudSimPlus.VERSION);
 
         //Gets the path to the YAML file inside the resource directory.
         final String yamlFilePath = ResourceLoader.getResourcePath(getClass(), "CloudEnvironment1.yml");