apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.13'

Browse Source
This commit is contained in:
Rohit Yadav 2020-01-31 15:28:34 +05:30
commit f72f39cd11
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/bindir/libvirtqemuhook.in
View File

@ -65,11 +65,15 @@ def handleMigrateBegin():
bridge = source.getAttribute("bridge") bridge = source.getAttribute("bridge")
if isOldStyleBridge(bridge): if isOldStyleBridge(bridge):
vlanId = bridge.replace("cloudVirBr", "") vlanId = bridge.replace("cloudVirBr", "")
phyDev = getGuestNetworkDevice()
elif isNewStyleBridge(bridge): elif isNewStyleBridge(bridge):
vlanId = re.sub(r"br(\w+)-", "", bridge) vlanId = re.sub(r"br(\w+)-", "", bridge)
phyDev = re.sub(r"-(\d+)$", "" , re.sub(r"^br", "" ,bridge))
netlib = networkConfig()
if not netlib.isNetworkDev(phyDev):
phyDev = getGuestNetworkDevice()
else: else:
continue continue
phyDev = getGuestNetworkDevice()
newBrName = "br" + phyDev + "-" + vlanId newBrName = "br" + phyDev + "-" + vlanId
source.setAttribute("bridge", newBrName) source.setAttribute("bridge", newBrName)
print(domain.toxml()) print(domain.toxml())

4
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View File

@ -673,8 +673,6 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
zoneId = snapshotCheck.getDataCenterId(); zoneId = snapshotCheck.getDataCenterId();
} }
_configMgr.checkDiskOfferingAccess(null, diskOffering, _dcDao.findById(zoneId));
if (diskOffering == null) { // Pure snapshot is being used to create volume. if (diskOffering == null) { // Pure snapshot is being used to create volume.
diskOfferingId = snapshotCheck.getDiskOfferingId(); diskOfferingId = snapshotCheck.getDiskOfferingId();
diskOffering = _diskOfferingDao.findById(diskOfferingId); diskOffering = _diskOfferingDao.findById(diskOfferingId);
@ -689,6 +687,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
} }
} }
_configMgr.checkDiskOfferingAccess(null, diskOffering, _dcDao.findById(zoneId));
// check snapshot permissions // check snapshot permissions
_accountMgr.checkAccess(caller, null, true, snapshotCheck); _accountMgr.checkAccess(caller, null, true, snapshotCheck);

6
ui/scripts/ui/widgets/listView.js
View File

@ -88,9 +88,9 @@
// Make sure the master checkbox is unselected // Make sure the master checkbox is unselected
if (multiSelect) { if (multiSelect) {
var $listView = $instanceRow.closest('.list-view'); var $listView2 = $instanceRow.closest('.list-view');
$listView.find('input.multiSelectMasterCheckbox').prop('checked', false); $listView2.find('input.multiSelectMasterCheckbox').prop('checked', false);
toggleMultiSelectActions($listView, false); toggleMultiSelectActions($listView2, false);
} }
var externalLinkAction = action.externalLink; var externalLinkAction = action.externalLink;