Skip to content

Commit b3cda0f

Browse files
committed
DatacenterCharacteristics cleanup
- Remove useless (unused) attributes vmm, architecture and os - Update docs Signed-off-by: Manoel Campos <[email protected]>
1 parent b3798cd commit b3cda0f

File tree

2 files changed

+0
-66
lines changed

2 files changed

+0
-66
lines changed

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

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ public final class DatacenterRegistry implements Serializable{
3737
private long id;
3838
private String name;
3939
private Integer amount;
40-
private String architecture;
41-
private String os;
42-
private String vmm;
4340
private double timeZone;
4441
private String vmAllocationPolicy;
4542
private boolean vmMigration;
@@ -57,9 +54,6 @@ public DatacenterRegistry() {
5754
setAmount(1);
5855
sans = new ArrayList<>();
5956
hosts = new ArrayList<>();
60-
setArchitecture("x86");
61-
setOs("Linux");
62-
setVmm("Xen");
6357
setSchedulingInterval(0);
6458
}
6559

@@ -99,60 +93,6 @@ public void setName(String name) {
9993
this.name = name;
10094
}
10195

102-
/**
103-
* Gets the datacenter's architecture.
104-
*
105-
* @return the datacenter's architecture.
106-
*/
107-
public String getArchitecture() {
108-
return architecture;
109-
}
110-
111-
/**
112-
* Sets the datacenter's architecture.
113-
*
114-
* @param architecture the datacenter's architecture.
115-
*/
116-
public void setArchitecture(String architecture) {
117-
this.architecture = architecture;
118-
}
119-
120-
/**
121-
* Gets the datacenter's operating system.
122-
*
123-
* @return the datacenter's operating system.
124-
*/
125-
public String getOs() {
126-
return os;
127-
}
128-
129-
/**
130-
* Sets the datacenter's operating system.
131-
*
132-
* @param os the datacenter's operating system.
133-
*/
134-
public void setOs(String os) {
135-
this.os = os;
136-
}
137-
138-
/**
139-
* Gets the datacenter's hypervisor.
140-
*
141-
* @return the datacenter's hypervisor.
142-
*/
143-
public String getVmm() {
144-
return vmm;
145-
}
146-
147-
/**
148-
* Sets the datacenter's hypervisor.
149-
*
150-
* @param vmm the datacenter's hypervisor.
151-
*/
152-
public void setVmm(String vmm) {
153-
this.vmm = vmm;
154-
}
155-
15696
/**
15797
* Gets the datacenter's time zone.
15898
*
@@ -391,9 +331,6 @@ public int hashCode() {
391331
@Override
392332
public String toString() {
393333
StringBuilder s = new StringBuilder("Name="+getName()+"\n");
394-
s.append("Architecture=").append(getArchitecture()).append("\n");
395-
s.append("Operating System=").append(getOs()).append("\n");
396-
s.append("Hypervisor=").append(getVmm()).append("\n");
397334
s.append("Allocation Policy ID=").append(getVmAllocationPolicy()).append("\n");
398335
s.append("Time Zone (GMT)=").append(getTimeZone()).append("\n");
399336
s.append("VM Migrations=").append(isVmMigration()).append("\n");

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,6 @@ private List<SanStorage> createSan(final DatacenterRegistry dcr) throws IllegalA
384384
private void setDatacenterCharacteristics(final Datacenter dc, final DatacenterRegistry dcr)
385385
{
386386
dc.getCharacteristics()
387-
.setArchitecture(dcr.getArchitecture())
388-
.setOs(dcr.getOs())
389-
.setVmm(dcr.getVmm())
390387
.setCostPerSecond(dcr.getCostPerSec())
391388
.setCostPerMem(dcr.getCostPerMem())
392389
.setCostPerStorage(dcr.getCostPerStorage())

0 commit comments

Comments
 (0)