etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'apache/4.16'

This commit is contained in:
Wei Zhou 2021-11-29 14:12:22 +01:00
parent 6e04f8711b 965316b842
commit 14f3b24975
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -3113,6 +3113,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
if (networkAccount != null) {
_networkAccountDao.remove(networkAccount.getId());
}
networkDetailsDao.removeDetails(networkFinal.getId());
}
final NetworkOffering ntwkOff = _entityMgr.findById(NetworkOffering.class, networkFinal.getNetworkOfferingId());
@ -4400,4 +4402,4 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
GuestDomainSuffix, NetworkThrottlingRate, MinVRVersion,
PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RollingRestartEnabled};
}
}
}

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

@ -57,6 +57,7 @@ public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements A
public AccountDaoImpl() {
AllFieldsSearch = createSearchBuilder();
AllFieldsSearch.and("id", AllFieldsSearch.entity().getId(), SearchCriteria.Op.EQ);
AllFieldsSearch.and("accountName", AllFieldsSearch.entity().getAccountName(), SearchCriteria.Op.EQ);
AllFieldsSearch.and("domainId", AllFieldsSearch.entity().getDomainId(), SearchCriteria.Op.EQ);
AllFieldsSearch.and("state", AllFieldsSearch.entity().getState(), SearchCriteria.Op.EQ);