Skip to content

Commit 650b5ec

Browse files
committed
Merge branch '4.20'
2 parents 99863c2 + 6bb6fe7 commit 650b5ec

File tree

27 files changed

+790
-185
lines changed

27 files changed

+790
-185
lines changed

api/src/main/java/com/cloud/kubernetes/cluster/KubernetesServiceHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.apache.cloudstack.acl.ControlledEntity;
2020

21+
import com.cloud.user.Account;
2122
import com.cloud.uservm.UserVm;
2223
import com.cloud.utils.component.Adapter;
2324

@@ -26,4 +27,5 @@ public interface KubernetesServiceHelper extends Adapter {
2627
ControlledEntity findByUuid(String uuid);
2728
ControlledEntity findByVmId(long vmId);
2829
void checkVmCanBeDestroyed(UserVm userVm);
30+
void cleanupForAccount(Account account);
2931
}

api/src/main/java/com/cloud/user/Account.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public static Type getFromValue(Integer type){
7171
}
7272

7373
public static final long ACCOUNT_ID_SYSTEM = 1;
74+
public static final long ACCOUNT_ID_ADMIN = 2;
7475

7576
public String getAccountName();
7677

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
596596
offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
597597
"Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null,
598598
defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true, true, false, false, null, null, null,true, null, null, false);
599+
599600
}
600601

601602
//#6 - default vpc offering with no LB service

engine/schema/src/main/java/com/cloud/user/dao/AccountDao.java

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

19+
import java.util.Date;
20+
import java.util.List;
21+
1922
import com.cloud.user.Account;
2023
import com.cloud.user.AccountVO;
2124
import com.cloud.user.User;
2225
import com.cloud.utils.Pair;
2326
import com.cloud.utils.db.Filter;
2427
import com.cloud.utils.db.GenericDao;
2528

26-
import java.util.Date;
27-
import java.util.List;
28-
2929
public interface AccountDao extends GenericDao<AccountVO, Long> {
3030
Pair<User, Account> findUserAccountByApiKey(String apiKey);
3131

3232
List<AccountVO> findAccountsLike(String accountName);
3333

3434
Pair<List<AccountVO>, Integer> findAccountsLike(String accountName, Filter filter);
3535

36+
List<AccountVO> findAccountsByName(String accountName);
37+
3638
List<AccountVO> findActiveAccounts(Long maxAccountId, Filter filter);
3739

3840
List<AccountVO> findRecentlyDeletedAccounts(Long maxAccountId, Date earliestRemovedDate, Filter filter);

engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java

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

19+
import java.sql.PreparedStatement;
20+
import java.sql.ResultSet;
21+
import java.util.Date;
22+
import java.util.List;
23+
24+
import org.apache.commons.lang3.StringUtils;
25+
import org.springframework.stereotype.Component;
26+
1927
import com.cloud.user.Account;
2028
import com.cloud.user.Account.State;
2129
import com.cloud.user.AccountVO;
@@ -30,14 +38,7 @@
3038
import com.cloud.utils.db.SearchCriteria;
3139
import com.cloud.utils.db.SearchCriteria.Func;
3240
import com.cloud.utils.db.SearchCriteria.Op;
33-
import org.apache.commons.lang3.StringUtils;
3441
import com.cloud.utils.db.TransactionLegacy;
35-
import org.springframework.stereotype.Component;
36-
37-
import java.sql.PreparedStatement;
38-
import java.sql.ResultSet;
39-
import java.util.Date;
40-
import java.util.List;
4142

4243
@Component
4344
public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements AccountDao {
@@ -190,6 +191,16 @@ public Pair<List<AccountVO>, Integer> findAccountsLike(String accountName, Filte
190191
return searchAndCount(sc, filter);
191192
}
192193

194+
@Override
195+
public List<AccountVO> findAccountsByName(String accountName) {
196+
SearchBuilder<AccountVO> sb = createSearchBuilder();
197+
sb.and("accountName", sb.entity().getAccountName(), SearchCriteria.Op.EQ);
198+
sb.done();
199+
SearchCriteria<AccountVO> sc = sb.create();
200+
sc.setParameters("accountName", accountName);
201+
return search(sc, null);
202+
}
203+
193204
@Override
194205
public Account findEnabledAccount(String accountName, Long domainId) {
195206
SearchCriteria<AccountVO> sc = AllFieldsSearch.create("accountName", accountName);

plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaConfigureEmailCmd.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.cloudstack.api.command;
1818

1919
import com.cloud.utils.Pair;
20+
import org.apache.cloudstack.api.ACL;
2021
import org.apache.cloudstack.api.APICommand;
2122
import org.apache.cloudstack.api.ApiConstants;
2223
import org.apache.cloudstack.api.BaseCmd;
@@ -32,6 +33,7 @@
3233
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
3334
public class QuotaConfigureEmailCmd extends BaseCmd {
3435

36+
@ACL
3537
@Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, required = true,
3638
description = "Account ID for which to configure quota template email or min balance")
3739
private long accountId;

plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaListEmailConfigurationCmd.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//under the License.
1717
package org.apache.cloudstack.api.command;
1818

19-
import com.cloud.user.Account;
19+
import org.apache.cloudstack.api.ACL;
2020
import org.apache.cloudstack.api.APICommand;
2121
import org.apache.cloudstack.api.ApiConstants;
2222
import org.apache.cloudstack.api.BaseCmd;
@@ -32,6 +32,7 @@
3232
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
3333
public class QuotaListEmailConfigurationCmd extends BaseCmd {
3434

35+
@ACL
3536
@Parameter(name = ApiConstants.ACCOUNT_ID, type = BaseCmd.CommandType.UUID, entityType = AccountResponse.class, required = true,
3637
description = "Account ID for which to list quota template email configurations")
3738
private long accountId;
@@ -49,6 +50,6 @@ public void execute() {
4950

5051
@Override
5152
public long getEntityOwnerId() {
52-
return Account.ACCOUNT_ID_SYSTEM;
53+
return accountId;
5354
}
5455
}

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.HashMap;
2424
import java.util.List;
2525
import java.util.Map;
26+
import java.util.Objects;
2627
import java.util.Set;
2728

2829
import com.cloud.agent.resource.virtualnetwork.VRScripts;
@@ -247,7 +248,7 @@ private void prepareDisks(VirtualMachineTO vmSpec, CitrixResourceBase citrixReso
247248
List<DiskTO> disks = new ArrayList<DiskTO>(vmSpec.getDisks().length);
248249
int index = 0;
249250
for (final DiskTO disk : vmSpec.getDisks()) {
250-
if (Volume.Type.ISO.equals(disk.getType())) {
251+
if (Volume.Type.ISO.equals(disk.getType()) && Objects.nonNull(disk.getPath())) {
251252
disks.add(0, disk);
252253
} else {
253254
disks.add(index, disk);

0 commit comments

Comments
 (0)