Skip to content

Commit 9aec9c6

Browse files
sudisonsudison
committed
merge to master
2 parents f0ebb05 + 0a4e651 commit 9aec9c6

195 files changed

Lines changed: 7321 additions & 6317 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/com/cloud/agent/api/to/VolumeTO.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ protected VolumeTO() {
3737
private long deviceId;
3838
private String chainInfo;
3939
private String guestOsType;
40+
private Long bytesReadRate;
41+
private Long bytesWriteRate;
42+
private Long iopsReadRate;
43+
private Long iopsWriteRate;
4044

4145
public VolumeTO(long id, Volume.Type type, StoragePoolType poolType, String poolUuid, String name, String mountPoint, String path, long size, String chainInfo) {
4246
this.id = id;
@@ -133,4 +137,37 @@ public void setPath(String path){
133137
public String toString() {
134138
return new StringBuilder("Vol[").append(id).append("|").append(type).append("|").append(path).append("|").append(size).append("]").toString();
135139
}
140+
141+
public void setBytesReadRate(Long bytesReadRate) {
142+
this.bytesReadRate = bytesReadRate;
143+
}
144+
145+
public Long getBytesReadRate() {
146+
return bytesReadRate;
147+
}
148+
149+
public void setBytesWriteRate(Long bytesWriteRate) {
150+
this.bytesWriteRate = bytesWriteRate;
151+
}
152+
153+
public Long getBytesWriteRate() {
154+
return bytesWriteRate;
155+
}
156+
157+
public void setIopsReadRate(Long iopsReadRate) {
158+
this.iopsReadRate = iopsReadRate;
159+
}
160+
161+
public Long getIopsReadRate() {
162+
return iopsReadRate;
163+
}
164+
165+
public void setIopsWriteRate(Long iopsWriteRate) {
166+
this.iopsWriteRate = iopsWriteRate;
167+
}
168+
169+
public Long getIopsWriteRate() {
170+
return iopsWriteRate;
171+
}
172+
136173
}

‎api/src/com/cloud/network/NetworkModel.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,4 +274,6 @@ Map<PublicIpAddress, Set<Service>> getIpToServices(List<? extends PublicIpAddres
274274
Networks.IsolationType[] listNetworkIsolationMethods();
275275

276276
Nic getNicInNetworkIncludingRemoved(long vmId, long networkId);
277+
278+
boolean getExecuteInSeqNtwkElmtCmd();
277279
}

‎api/src/com/cloud/offering/DiskOffering.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,20 @@ public interface DiskOffering extends InfrastructureEntity, Identity, InternalId
5252
boolean isCustomized();
5353

5454
void setDiskSize(long diskSize);
55+
56+
void setBytesReadRate(Long bytesReadRate);
57+
58+
Long getBytesReadRate();
59+
60+
void setBytesWriteRate(Long bytesWriteRate);
61+
62+
Long getBytesWriteRate();
63+
64+
void setIopsReadRate(Long iopsReadRate);
65+
66+
Long getIopsReadRate();
67+
68+
void setIopsWriteRate(Long iopsWriteRate);
69+
70+
Long getIopsWriteRate();
5571
}

‎api/src/com/cloud/offering/NetworkOffering.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
// under the License.
1717
package com.cloud.offering;
1818

19-
import java.util.Map;
20-
2119
import org.apache.cloudstack.acl.InfrastructureEntity;
2220
import org.apache.cloudstack.api.Identity;
2321
import org.apache.cloudstack.api.InternalIdentity;
@@ -61,6 +59,8 @@ public enum Detail {
6159
public final static String DefaultSharedEIPandELBNetworkOffering = "DefaultSharedNetscalerEIPandELBNetworkOffering";
6260
public final static String DefaultIsolatedNetworkOfferingForVpcNetworks = "DefaultIsolatedNetworkOfferingForVpcNetworks";
6361
public final static String DefaultIsolatedNetworkOfferingForVpcNetworksNoLB = "DefaultIsolatedNetworkOfferingForVpcNetworksNoLB";
62+
public final static String DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB = "DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB";
63+
6464

6565
/**
6666
* @return name for the network offering.

‎api/src/com/cloud/storage/Storage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ public static enum StoragePoolType {
9898
Iscsi(true), // for e.g., ZFS Comstar
9999
ISO(false), // for iso image
100100
LVM(false), // XenServer local LVM SR
101-
CLVM(true),
102-
RBD(true),
101+
CLVM(true),
102+
RBD(true), // http://libvirt.org/storage.html#StorageBackendRBD
103103
SharedMountPoint(true),
104104
VMFS(true), // VMware VMFS storage
105105
PreSetup(true), // for XenServer, Storage Pool is set up by customers.

‎api/src/com/cloud/storage/Volume.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ enum Event {
153153

154154
Date getCreated();
155155

156-
long getDiskOfferingId();
156+
Long getDiskOfferingId();
157157

158158
String getChainInfo();
159159

‎api/src/com/cloud/vm/DiskProfile.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ public class DiskProfile {
3535
private Long templateId;
3636
private long volumeId;
3737
private String path;
38+
private Long bytesReadRate;
39+
private Long bytesWriteRate;
40+
private Long iopsReadRate;
41+
private Long iopsWriteRate;
3842

3943
private HypervisorType hyperType;
4044

@@ -154,4 +158,36 @@ public String getPath() {
154158
public void setSize(long size) {
155159
this.size = size;
156160
}
161+
162+
public void setBytesReadRate(Long bytesReadRate) {
163+
this.bytesReadRate = bytesReadRate;
164+
}
165+
166+
public Long getBytesReadRate() {
167+
return bytesReadRate;
168+
}
169+
170+
public void setBytesWriteRate(Long bytesWriteRate) {
171+
this.bytesWriteRate = bytesWriteRate;
172+
}
173+
174+
public Long getBytesWriteRate() {
175+
return bytesWriteRate;
176+
}
177+
178+
public void setIopsReadRate(Long iopsReadRate) {
179+
this.iopsReadRate = iopsReadRate;
180+
}
181+
182+
public Long getIopsReadRate() {
183+
return iopsReadRate;
184+
}
185+
186+
public void setIopsWriteRate(Long iopsWriteRate) {
187+
this.iopsWriteRate = iopsWriteRate;
188+
}
189+
190+
public Long getIopsWriteRate() {
191+
return iopsWriteRate;
192+
}
157193
}

‎api/src/org/apache/cloudstack/api/ApiConstants.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public class ApiConstants {
3131
public static final String BOOTABLE = "bootable";
3232
public static final String BIND_DN = "binddn";
3333
public static final String BIND_PASSWORD = "bindpass";
34+
public static final String BYTES_READ_RATE = "bytesreadrate";
35+
public static final String BYTES_WRITE_RATE = "byteswriterate";
3436
public static final String CATEGORY = "category";
3537
public static final String CERTIFICATE = "certificate";
3638
public static final String PRIVATE_KEY = "privatekey";
@@ -104,6 +106,8 @@ public class ApiConstants {
104106
public static final String INTERNAL_DNS1 = "internaldns1";
105107
public static final String INTERNAL_DNS2 = "internaldns2";
106108
public static final String INTERVAL_TYPE = "intervaltype";
109+
public static final String IOPS_READ_RATE = "iopsreadrate";
110+
public static final String IOPS_WRITE_RATE = "iopswriterate";
107111
public static final String IP_ADDRESS = "ipaddress";
108112
public static final String IP6_ADDRESS = "ip6address";
109113
public static final String IP_ADDRESS_ID = "ipaddressid";
@@ -241,8 +245,7 @@ public class ApiConstants {
241245
public static final String IS_VOLATILE = "isvolatile";
242246
public static final String VOLUME_ID = "volumeid";
243247
public static final String ZONE_ID = "zoneid";
244-
public static final String ZONE_NAME = "zonename";
245-
public static final String ZONE_TYPE = "zonetype";
248+
public static final String ZONE_NAME = "zonename";
246249
public static final String NETWORK_TYPE = "networktype";
247250
public static final String PAGE = "page";
248251
public static final String PAGE_SIZE = "pagesize";

‎api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ public class ListClustersCmd extends BaseListCmd {
7070
@Parameter(name=ApiConstants.MANAGED_STATE, type=CommandType.STRING, description="whether this cluster is managed by cloudstack")
7171
private String managedState;
7272

73-
@Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
74-
private String zoneType;
75-
7673
@Parameter(name=ApiConstants.SHOW_CAPACITIES, type=CommandType.BOOLEAN, description="flag to display the capacity of the clusters")
7774
private Boolean showCapacities;
7875

@@ -117,10 +114,7 @@ public void setManagedstate(String managedstate) {
117114
this.managedState = managedstate;
118115
}
119116

120-
public String getZoneType() {
121-
return zoneType;
122-
}
123-
117+
124118
public Boolean getShowCapacities() {
125119
return showCapacities;
126120
}

‎api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@ public String getCommandName() {
7070
public void execute() {
7171
ListResponse<HostForMigrationResponse> response = null;
7272
Pair<List<? extends Host>,Integer> result;
73-
List<? extends Host> hostsWithCapacity = new ArrayList<Host>();
7473
Map<Host, Boolean> hostsRequiringStorageMotion;
7574

7675
Ternary<Pair<List<? extends Host>,Integer>, List<? extends Host>, Map<Host, Boolean>> hostsForMigration =
7776
_mgr.listHostsForMigrationOfVM(getVirtualMachineId(), this.getStartIndex(), this.getPageSizeVal());
7877
result = hostsForMigration.first();
79-
hostsWithCapacity = hostsForMigration.second();
78+
List<? extends Host> hostsWithCapacity = hostsForMigration.second();
8079
hostsRequiringStorageMotion = hostsForMigration.third();
8180

8281
response = new ListResponse<HostForMigrationResponse>();

0 commit comments

Comments
 (0)