Skip to content

Commit 55b28d6

Browse files
shwstpprshwstppr
committed
Merge remote-tracking branch 'apache/4.19'
2 parents 02305fb + c25264b commit 55b28d6

46 files changed

Lines changed: 721 additions & 78 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/main/java/org/apache/cloudstack/alert/AlertService.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ private static AlertType getAlertType(short type) {
9191
return null;
9292
}
9393

94+
public static Set<AlertType> getAlertTypes() {
95+
return defaultAlertTypes;
96+
}
97+
9498
@Override
9599
public String toString() {
96100
return String.valueOf(this.getType());

‎api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.apache.cloudstack.acl.ProjectRole;
2121
import org.apache.cloudstack.acl.RoleType;
2222
import org.apache.cloudstack.api.APICommand;
23+
import org.apache.cloudstack.api.ApiCommandResourceType;
2324
import org.apache.cloudstack.api.ApiConstants;
2425
import org.apache.cloudstack.api.ApiErrorCode;
2526
import org.apache.cloudstack.api.BaseCmd;
@@ -70,4 +71,13 @@ public long getEntityOwnerId() {
7071
return Account.ACCOUNT_ID_SYSTEM;
7172
}
7273

74+
@Override
75+
public Long getApiResourceId() {
76+
return getProjectId();
77+
}
78+
79+
@Override
80+
public ApiCommandResourceType getApiResourceType() {
81+
return ApiCommandResourceType.Project;
82+
}
7383
}

‎api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.cloudstack.acl.RoleType;
2323
import org.apache.cloudstack.api.APICommand;
2424
import org.apache.cloudstack.api.ApiArgValidator;
25+
import org.apache.cloudstack.api.ApiCommandResourceType;
2526
import org.apache.cloudstack.api.ApiConstants;
2627
import org.apache.cloudstack.api.ApiErrorCode;
2728
import org.apache.cloudstack.api.Parameter;
@@ -96,4 +97,14 @@ private void setupResponse(final ProjectRolePermission rolePermission, final Pro
9697
response.setObjectName("projectrolepermission");
9798
setResponseObject(response);
9899
}
100+
101+
@Override
102+
public Long getApiResourceId() {
103+
return getProjectId();
104+
}
105+
106+
@Override
107+
public ApiCommandResourceType getApiResourceType() {
108+
return ApiCommandResourceType.Project;
109+
}
99110
}

‎api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.cloudstack.acl.RoleType;
2222
import org.apache.cloudstack.api.APICommand;
2323
import org.apache.cloudstack.api.ApiArgValidator;
24+
import org.apache.cloudstack.api.ApiCommandResourceType;
2425
import org.apache.cloudstack.api.ApiConstants;
2526
import org.apache.cloudstack.api.ApiErrorCode;
2627
import org.apache.cloudstack.api.BaseCmd;
@@ -79,4 +80,14 @@ public void execute() {
7980
public long getEntityOwnerId() {
8081
return CallContext.current().getCallingAccountId();
8182
}
83+
84+
@Override
85+
public Long getApiResourceId() {
86+
return getProjectId();
87+
}
88+
89+
@Override
90+
public ApiCommandResourceType getApiResourceType() {
91+
return ApiCommandResourceType.Project;
92+
}
8293
}

‎api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.cloudstack.acl.RoleType;
2222
import org.apache.cloudstack.api.APICommand;
2323
import org.apache.cloudstack.api.ApiArgValidator;
24+
import org.apache.cloudstack.api.ApiCommandResourceType;
2425
import org.apache.cloudstack.api.ApiConstants;
2526
import org.apache.cloudstack.api.ApiErrorCode;
2627
import org.apache.cloudstack.api.BaseCmd;
@@ -80,4 +81,14 @@ public void execute() {
8081
public long getEntityOwnerId() {
8182
return CallContext.current().getCallingAccountId();
8283
}
84+
85+
@Override
86+
public Long getApiResourceId() {
87+
return getProjectId();
88+
}
89+
90+
@Override
91+
public ApiCommandResourceType getApiResourceType() {
92+
return ApiCommandResourceType.Project;
93+
}
8394
}

‎api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.cloudstack.acl.RoleType;
2222
import org.apache.cloudstack.api.APICommand;
2323
import org.apache.cloudstack.api.ApiArgValidator;
24+
import org.apache.cloudstack.api.ApiCommandResourceType;
2425
import org.apache.cloudstack.api.ApiConstants;
2526
import org.apache.cloudstack.api.ApiErrorCode;
2627
import org.apache.cloudstack.api.BaseCmd;
@@ -76,4 +77,14 @@ public void execute() {
7677
public long getEntityOwnerId() {
7778
return 0;
7879
}
80+
81+
@Override
82+
public Long getApiResourceId() {
83+
return getProjectId();
84+
}
85+
86+
@Override
87+
public ApiCommandResourceType getApiResourceType() {
88+
return ApiCommandResourceType.Project;
89+
}
7990
}

‎api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.cloudstack.acl.RoleType;
2727
import org.apache.cloudstack.api.APICommand;
2828
import org.apache.cloudstack.api.ApiArgValidator;
29+
import org.apache.cloudstack.api.ApiCommandResourceType;
2930
import org.apache.cloudstack.api.ApiConstants;
3031
import org.apache.cloudstack.api.ApiErrorCode;
3132
import org.apache.cloudstack.api.BaseCmd;
@@ -154,4 +155,14 @@ private boolean updateProjectRolePermissionOrder(ProjectRole projectRole) {
154155
public long getEntityOwnerId() {
155156
return CallContext.current().getCallingAccountId();
156157
}
158+
159+
@Override
160+
public Long getApiResourceId() {
161+
return getProjectId();
162+
}
163+
164+
@Override
165+
public ApiCommandResourceType getApiResourceType() {
166+
return ApiCommandResourceType.Project;
167+
}
157168
}

‎api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22+
import com.cloud.offering.DiskOffering.State;
2223
import org.apache.cloudstack.api.APICommand;
2324
import org.apache.cloudstack.api.ApiCommandResourceType;
2425
import org.apache.cloudstack.api.ApiConstants;
@@ -27,6 +28,7 @@
2728
import org.apache.cloudstack.api.Parameter;
2829
import org.apache.cloudstack.api.ServerApiException;
2930
import org.apache.cloudstack.api.response.DiskOfferingResponse;
31+
import org.apache.commons.lang3.EnumUtils;
3032
import org.apache.commons.lang3.StringUtils;
3133

3234
import com.cloud.dc.DataCenter;
@@ -121,6 +123,9 @@ public class UpdateDiskOfferingCmd extends BaseCmd {
121123
@Parameter(name = ApiConstants.CACHE_MODE, type = CommandType.STRING, description = "the cache mode to use for this disk offering", since = "4.15")
122124
private String cacheMode;
123125

126+
@Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "state of the disk offering")
127+
private String diskOfferingState;
128+
124129
/////////////////////////////////////////////////////
125130
/////////////////// Accessors ///////////////////////
126131
/////////////////////////////////////////////////////
@@ -260,6 +265,13 @@ public Long getIopsWriteRateMax() {
260265
public Long getIopsWriteRateMaxLength() {
261266
return iopsWriteRateMaxLength;
262267
}
268+
public State getState() {
269+
State state = EnumUtils.getEnumIgnoreCase(State.class, diskOfferingState);
270+
if (StringUtils.isNotBlank(diskOfferingState) && state == null) {
271+
throw new InvalidParameterValueException("Invalid state value: " + diskOfferingState);
272+
}
273+
return state;
274+
}
263275

264276
/////////////////////////////////////////////////////
265277
/////////////// API Implementation///////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22+
import com.cloud.offering.ServiceOffering.State;
2223
import org.apache.cloudstack.api.APICommand;
2324
import org.apache.cloudstack.api.ApiCommandResourceType;
2425
import org.apache.cloudstack.api.ApiConstants;
@@ -27,6 +28,7 @@
2728
import org.apache.cloudstack.api.Parameter;
2829
import org.apache.cloudstack.api.ServerApiException;
2930
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
31+
import org.apache.commons.lang3.EnumUtils;
3032
import org.apache.commons.lang3.StringUtils;
3133

3234
import com.cloud.dc.DataCenter;
@@ -82,6 +84,11 @@ public class UpdateServiceOfferingCmd extends BaseCmd {
8284
since = "4.16")
8385
private String hostTags;
8486

87+
@Parameter(name = ApiConstants.STATE,
88+
type = CommandType.STRING,
89+
description = "state of the service offering")
90+
private String serviceOfferingState;
91+
8592
/////////////////////////////////////////////////////
8693
/////////////////// Accessors ///////////////////////
8794
/////////////////////////////////////////////////////
@@ -170,6 +177,14 @@ public String getHostTags() {
170177
return hostTags;
171178
}
172179

180+
public State getState() {
181+
State state = EnumUtils.getEnumIgnoreCase(State.class, serviceOfferingState);
182+
if (StringUtils.isNotBlank(serviceOfferingState) && state == null) {
183+
throw new InvalidParameterValueException("Invalid state value: " + serviceOfferingState);
184+
}
185+
return state;
186+
}
187+
173188
/////////////////////////////////////////////////////
174189
/////////////// API Implementation///////////////////
175190
/////////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.cloudstack.acl.RoleType;
2727
import org.apache.cloudstack.api.APICommand;
2828
import org.apache.cloudstack.api.ApiArgValidator;
29+
import org.apache.cloudstack.api.ApiCommandResourceType;
2930
import org.apache.cloudstack.api.ApiConstants;
3031
import org.apache.cloudstack.api.ApiErrorCode;
3132
import org.apache.cloudstack.api.BaseAsyncCmd;
@@ -102,4 +103,14 @@ public String getEventType() {
102103
public String getEventDescription() {
103104
return "change out-of-band management password for host: " + getHostId();
104105
}
106+
107+
@Override
108+
public Long getApiResourceId() {
109+
return getHostId();
110+
}
111+
112+
@Override
113+
public ApiCommandResourceType getApiResourceType() {
114+
return ApiCommandResourceType.Host;
115+
}
105116
}

0 commit comments

Comments
 (0)