Skip to content

Commit 559621e

Browse files
chezsan770chezsan770
authored
Merge branch 'main' into main
2 parents b1acbc8 + cb822fe commit 559621e

101 files changed

Lines changed: 728 additions & 362 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/com/cloud/network/NetworkService.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ Network createGuestNetwork(long networkOfferingId, String name, String displayTe
108108
PhysicalNetwork physicalNetwork, long zoneId, ControlledEntity.ACLType aclType) throws
109109
InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException;
110110

111+
Network createGuestNetwork(long networkOfferingId, String name, String displayText, Account owner,
112+
PhysicalNetwork physicalNetwork, long zoneId, ControlledEntity.ACLType aclType, Pair<Integer, Integer> vrIfaceMTUs) throws
113+
InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException;
114+
111115
Pair<List<? extends Network>, Integer> searchForNetworks(ListNetworksCmd cmd);
112116

113117
boolean deleteNetwork(long networkId, boolean forced);

‎api/src/main/java/com/cloud/server/ResourceTag.java‎

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

19-
import org.apache.cloudstack.acl.ControlledEntity;
20-
import org.apache.cloudstack.api.Identity;
21-
import org.apache.cloudstack.api.InternalIdentity;
22-
2319
import java.util.HashMap;
2420
import java.util.Locale;
2521
import java.util.Map;
2622

23+
import org.apache.cloudstack.acl.ControlledEntity;
24+
import org.apache.cloudstack.api.Identity;
25+
import org.apache.cloudstack.api.InternalIdentity;
26+
2727
public interface ResourceTag extends ControlledEntity, Identity, InternalIdentity {
2828

2929
// FIXME - extract enum to another interface as its used both by resourceTags and resourceMetaData code
@@ -70,7 +70,7 @@ public enum ResourceObjectType {
7070
GuestOs(false, true),
7171
NetworkOffering(false, true),
7272
VpcOffering(true, false),
73-
Domain(false, false, true),
73+
Domain(true, false, true),
7474
ObjectStore(false, false, true);
7575

7676

‎api/src/main/java/com/cloud/user/AccountService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ User createUser(String userName, String password, String firstName, String lastN
124124

125125
void validateAccountHasAccessToResource(Account account, AccessType accessType, Object resource);
126126

127-
Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly);
127+
Long finalizeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly);
128128

129129
/**
130130
* returns the user account object for a given user id

‎api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.cloudstack.api.APICommand;
2424
import org.apache.cloudstack.api.ApiConstants;
2525
import org.apache.cloudstack.api.ApiConstants.DomainDetails;
26-
import org.apache.cloudstack.api.BaseListCmd;
26+
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
2727
import org.apache.cloudstack.api.Parameter;
2828
import org.apache.cloudstack.api.ResponseObject.ResponseView;
2929
import org.apache.cloudstack.api.command.user.UserCmd;
@@ -39,7 +39,7 @@
3939

4040
@APICommand(name = "listDomains", description = "Lists domains and provides detailed information for listed domains", responseObject = DomainResponse.class, responseView = ResponseView.Restricted, entityType = {Domain.class},
4141
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
42-
public class ListDomainsCmd extends BaseListCmd implements UserCmd {
42+
public class ListDomainsCmd extends BaseListTaggedResourcesCmd implements UserCmd {
4343

4444
private static final String s_name = "listdomainsresponse";
4545

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ public class ListHostsCmd extends BaseListCmd {
118118
since = "4.21.0")
119119
private String storageAccessGroup;
120120

121+
@Parameter(name = ApiConstants.VERSION, type = CommandType.STRING, description = "the host version", since = "4.20.3")
122+
private String version;
123+
121124
/////////////////////////////////////////////////////
122125
/////////////////// Accessors ///////////////////////
123126
/////////////////////////////////////////////////////
@@ -222,6 +225,10 @@ public ListHostsCmd(String storageAccessGroup) {
222225
this.storageAccessGroup = storageAccessGroup;
223226
}
224227

228+
public String getVersion() {
229+
return version;
230+
}
231+
225232
/////////////////////////////////////////////////////
226233
/////////////// API Implementation///////////////////
227234
/////////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ public class ListMgmtsCmd extends BaseListCmd {
4545
since = "4.20.1.0")
4646
private Boolean peers;
4747

48+
@Parameter(name = ApiConstants.VERSION, type = CommandType.STRING,
49+
description = "the version of the management server", since = "4.20.3")
50+
private String version;
51+
4852
/////////////////////////////////////////////////////
4953
/////////////////// Accessors ///////////////////////
5054
/////////////////////////////////////////////////////
@@ -61,6 +65,10 @@ public Boolean getPeers() {
6165
return BooleanUtils.toBooleanDefaultIfNull(peers, false);
6266
}
6367

68+
public String getVersion() {
69+
return version;
70+
}
71+
6472
/////////////////////////////////////////////////////
6573
/////////////// API Implementation///////////////////
6674
/////////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
292292

293293
@Override
294294
public long getEntityOwnerId() {
295-
Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true);
295+
Long accountId = _accountService.finalizeAccountId(accountName, domainId, projectId, true);
296296
if (accountId == null) {
297297
Account account = CallContext.current().getCallingAccount();
298298
if (account != null) {

‎api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ImportVolumeCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
156156

157157
@Override
158158
public long getEntityOwnerId() {
159-
Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true);
159+
Long accountId = _accountService.finalizeAccountId(accountName, domainId, projectId, true);
160160
if (accountId == null) {
161161
return CallContext.current().getCallingAccount().getId();
162162
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public static String getResultObjectName() {
232232

233233
@Override
234234
public long getEntityOwnerId() {
235-
Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true);
235+
Long accountId = _accountService.finalizeAccountId(accountName, domainId, projectId, true);
236236
if (accountId == null) {
237237
return CallContext.current().getCallingAccount().getId();
238238
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public String getEventType() {
137137

138138
@Override
139139
public long getEntityOwnerId() {
140-
Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true);
140+
Long accountId = _accountService.finalizeAccountId(accountName, domainId, projectId, true);
141141
if (accountId == null) {
142142
return CallContext.current().getCallingAccount().getId();
143143
}

0 commit comments

Comments
 (0)