Merge branch '4.19'

Author: DaanHoogland

engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java

@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.cloud.dc.VlanVO;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.impl.ConfigurationSubGroupVO;
 
@@ -189,7 +190,7 @@ DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2,
      * @param caller
      * @return success/failure
      */
-    boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account caller);
+    VlanVO deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account caller);
 
     void checkZoneAccess(Account caller, DataCenter zone);
 

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

@@ -259,6 +259,8 @@
 import com.googlecode.ipv6.IPv6Address;
 import org.jetbrains.annotations.NotNull;
 
+import static com.cloud.configuration.ConfigurationManager.MESSAGE_DELETE_VLAN_IP_RANGE_EVENT;
+
 /**
  * NetworkManagerImpl implements NetworkManager.
  */
@@ -3324,17 +3326,17 @@ public boolean destroyNetwork(final long networkId, final ReservationContext con
 
             final NetworkVO networkFinal = network;
             try {
-                Transaction.execute(new TransactionCallbackNoReturn() {
+                final List<VlanVO> deletedVlanRangeToPublish = Transaction.execute(new TransactionCallback<List<VlanVO>>() {
                     @Override
-                    public void doInTransactionWithoutResult(final TransactionStatus status) {
+                    public List<VlanVO> doInTransaction(TransactionStatus status) {
                         final NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, networkFinal.getGuruName());
 
                         if (!guru.trash(networkFinal, _networkOfferingDao.findById(networkFinal.getNetworkOfferingId()))) {
                             throw new CloudRuntimeException("Failed to trash network.");
                         }
-
-                        if (!deleteVlansInNetwork(networkFinal, context.getCaller().getId(), callerAccount)) {
-                            logger.warn("Failed to delete network {}; was unable to cleanup corresponding ip ranges", networkFinal);
+                        Pair<Boolean, List<VlanVO>> deletedVlans = deleteVlansInNetwork(networkFinal, context.getCaller().getId(), callerAccount);
+                        if (!deletedVlans.first()) {
+                            logger.warn("Failed to delete network " + networkFinal + "; was unable to cleanup corresponding ip ranges");
                             throw new CloudRuntimeException("Failed to delete network " + networkFinal + "; was unable to cleanup corresponding ip ranges");
                         } else {
                             // commit transaction only when ips and vlans for the network are released successfully
@@ -3367,8 +3369,10 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
                                 _resourceLimitMgr.decrementResourceCount(networkFinal.getAccountId(), ResourceType.network, networkFinal.getDisplayNetwork());
                             }
                         }
+                        return deletedVlans.second();
                     }
                 });
+                publishDeletedVlanRanges(deletedVlanRangeToPublish);
                 if (_networksDao.findById(network.getId()) == null) {
                     // remove its related ACL permission
                     final Pair<Class<?>, Long> networkMsg = new Pair<Class<?>, Long>(Network.class, networkFinal.getId());
@@ -3386,22 +3390,34 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
         return success;
     }
 
+    private void publishDeletedVlanRanges(List<VlanVO> deletedVlanRangeToPublish) {
+        if (CollectionUtils.isNotEmpty(deletedVlanRangeToPublish)) {
+            for (VlanVO vlan : deletedVlanRangeToPublish) {
+                _messageBus.publish(_name, MESSAGE_DELETE_VLAN_IP_RANGE_EVENT, PublishScope.LOCAL, vlan);
+            }
+        }
+    }
+
     @Override
     public boolean resourceCountNeedsUpdate(final NetworkOffering ntwkOff, final ACLType aclType) {
         //Update resource count only for Isolated account specific non-system networks
         final boolean updateResourceCount = ntwkOff.getGuestType() == GuestType.Isolated && !ntwkOff.isSystemOnly() && aclType == ACLType.Account;
         return updateResourceCount;
     }
 
-    protected boolean deleteVlansInNetwork(final NetworkVO network, final long userId, final Account callerAccount) {
+    protected Pair<Boolean, List<VlanVO>> deleteVlansInNetwork(final NetworkVO network, final long userId, final Account callerAccount) {
         final long networkId = network.getId();
         //cleanup Public vlans
         final List<VlanVO> publicVlans = _vlanDao.listVlansByNetworkId(networkId);
+        List<VlanVO> deletedPublicVlanRange = new ArrayList<>();
         boolean result = true;
         for (final VlanVO vlan : publicVlans) {
-            if (!_configMgr.deleteVlanAndPublicIpRange(userId, vlan.getId(), callerAccount)) {
-                logger.warn("Failed to delete vlan {});", vlan.getId());
+            VlanVO vlanRange = _configMgr.deleteVlanAndPublicIpRange(userId, vlan.getId(), callerAccount);
+            if (vlanRange == null) {
+                logger.warn("Failed to delete vlan " + vlan.getId() + ");");
                 result = false;
+            } else {
+                deletedPublicVlanRange.add(vlanRange);
             }
         }
 
@@ -3421,7 +3437,7 @@ protected boolean deleteVlansInNetwork(final NetworkVO network, final long userI
             _dcDao.releaseVnet(BroadcastDomainType.getValue(network.getBroadcastUri()), network.getDataCenterId(),
                     network.getPhysicalNetworkId(), network.getAccountId(), network.getReservationId());
         }
-        return result;
+        return new Pair<>(result, deletedPublicVlanRange);
     }
 
     public class NetworkGarbageCollector extends ManagedContextRunnable {

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -5362,7 +5362,7 @@ private void checkGatewayOverlap(String startIp, String endIp, String gateway) {
 
     @Override
     @DB
-    public boolean deleteVlanAndPublicIpRange(final long userId, final long vlanDbId, final Account caller) {
+    public VlanVO deleteVlanAndPublicIpRange(final long userId, final long vlanDbId, final Account caller) {
         VlanVO vlanRange = _vlanDao.findById(vlanDbId);
         if (vlanRange == null) {
             throw new InvalidParameterValueException("Please specify a valid IP range id.");
@@ -5468,9 +5468,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
             }
         });
 
-        messageBus.publish(_name, MESSAGE_DELETE_VLAN_IP_RANGE_EVENT, PublishScope.LOCAL, vlanRange);
-
-        return true;
+        return vlanRange;
     }
 
     @Override
@@ -5976,7 +5974,16 @@ public boolean deleteVlanIpRange(final DeleteVlanIpRangeCmd cmd) {
             throw new InvalidParameterValueException("Please specify a valid IP range id.");
         }
 
-        return deleteVlanAndPublicIpRange(CallContext.current().getCallingUserId(), vlanDbId, CallContext.current().getCallingAccount());
+        return deleteAndPublishVlanAndPublicIpRange(CallContext.current().getCallingUserId(), vlanDbId, CallContext.current().getCallingAccount());
+    }
+
+    private boolean deleteAndPublishVlanAndPublicIpRange(final long userId, final long vlanDbId, final Account caller) {
+        VlanVO deletedVlan = deleteVlanAndPublicIpRange(userId, vlanDbId, caller);
+        if (deletedVlan != null) {
+            messageBus.publish(_name, MESSAGE_DELETE_VLAN_IP_RANGE_EVENT, PublishScope.LOCAL, deletedVlan);
+            return true;
+        }
+        return false;
     }
 
     @Override

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -8044,7 +8044,7 @@ public Pair<UserVmVO, Volume> doInTransaction(final TransactionStatus status) th
 
                 // Detach, destroy and create the usage event for the old root volume.
                 _volsDao.detachVolume(root.getId());
-                _volumeService.destroyVolume(root.getId(), caller, Volume.State.Allocated.equals(root.getState()) || expunge, false);
+                destroyVolumeInContext(vm, Volume.State.Allocated.equals(root.getState()) || expunge, root);
 
                 if (currentTemplate.getId() != template.getId() && VirtualMachine.Type.User.equals(vm.type) && !VirtualMachineManager.ResourceCountRunningVMsonly.value()) {
                     ServiceOfferingVO serviceOffering = serviceOfferingDao.findById(vm.getId(), vm.getServiceOfferingId());

server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java

@@ -26,6 +26,7 @@
 import com.cloud.dc.HostPodVO;
 import com.cloud.dc.Pod;
 import com.cloud.dc.Vlan;
+import com.cloud.dc.VlanVO;
 import com.cloud.domain.Domain;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
@@ -515,9 +516,9 @@ public HostPodVO createPod(long userId, String podName, DataCenter zone, String
      * @see com.cloud.configuration.ConfigurationManager#deleteVlanAndPublicIpRange(long, long, com.cloud.user.Account)
      */
     @Override
-    public boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account caller) {
+    public VlanVO deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account caller) {
         // TODO Auto-generated method stub
-        return false;
+        return null;
     }
 
     /* (non-Javadoc)

test/integration/smoke/test_events_resource.py

@@ -116,20 +116,23 @@ def test_01_events_resource(self):
             self.services["domain"],
             parentdomainid=self.domain.id
         )
+        self.cleanup.append(domain1)
         self.services["domainid"] = domain1.id
 
         account = Account.create(
             self.apiclient,
             self.services["account"],
             domainid=domain1.id
         )
+        self.cleanup.append(account)
 
         account_network = Network.create(
             self.apiclient,
             self.services["network"],
             account.name,
             account.domainid
         )
+        self.cleanup.append(account_network)
         virtual_machine = VirtualMachine.create(
             self.apiclient,
             self.services,
@@ -138,6 +141,7 @@ def test_01_events_resource(self):
             networkids=account_network.id,
             serviceofferingid=self.service_offering.id
         )
+        self.cleanup.append(virtual_machine)
         volume = Volume.create(
             self.apiclient,
             self.services,
@@ -146,6 +150,7 @@ def test_01_events_resource(self):
             domainid=account.domainid,
             diskofferingid=self.disk_offering.id
         )
+        self.cleanup.append(volume)
         virtual_machine.attach_volume(
             self.apiclient,
             volume
@@ -157,15 +162,20 @@ def test_01_events_resource(self):
         time.sleep(self.services["sleep"])
         virtual_machine.detach_volume(self.apiclient, volume)
         volume.delete(self.apiclient)
+        self.cleanup.remove(volume)
         ts = str(time.time())
         virtual_machine.update(self.apiclient, displayname=ts)
         virtual_machine.delete(self.apiclient)
+        self.cleanup.remove(virtual_machine)
         account_network.update(self.apiclient, name=account_network.name + ts)
         account_network.delete(self.apiclient)
+        self.cleanup.remove(account_network)
         account.update(self.apiclient, newname=account.name + ts)
         account.disable(self.apiclient)
         account.delete(self.apiclient)
+        self.cleanup.remove(account)
         domain1.delete(self.apiclient)
+        self.cleanup.remove(domain1)
 
         cmd = listEvents.listEventsCmd()
         cmd.startdate = start_time
@@ -185,8 +195,9 @@ def test_01_events_resource(self):
         for event in events:
             if event.type.startswith("VM.") or (event.type.startswith("NETWORK.") and not event.type.startswith("NETWORK.ELEMENT")) or event.type.startswith("VOLUME.") or event.type.startswith("ACCOUNT.") or event.type.startswith("DOMAIN.") or event.type.startswith("TEMPLATE."):
                 if event.resourceid is None or event.resourcetype is None:
-                    self.debug("Failed event:: %s" % json.dumps(event, indent=2))
-                    self.fail("resourceid or resourcetype for the event not found!")
+                    event_json = json.dumps(event.__dict__, indent=2)
+                    self.debug("Failed event:: %s" % event_json)
+                    self.fail("resourceid or resourcetype not found for the event: %s" % event_json)
                 else:
                     self.debug("Event %s at %s:: Resource Type: %s, Resource ID: %s" % (event.type, event.created, event.resourcetype, event.resourceid))
 

ui/src/config/section/compute.js

@@ -626,7 +626,7 @@ export default {
       name: 'autoscalevmgroup',
       title: 'label.autoscale.vm.groups',
       icon: 'fullscreen-outlined',
-      docHelp: 'adminguide/autoscale_without_netscaler.html',
+      docHelp: 'adminguide/autoscale_with_virtual_router.html',
       resourceType: 'AutoScaleVmGroup',
       permission: ['listAutoScaleVmGroups'],
       columns: (store) => {

ui/src/views/compute/EditVM.vue

@@ -177,7 +177,8 @@ export default {
         isdynamicallyscalable: this.resource.isdynamicallyscalable,
         group: this.resource.group,
         securitygroupids: this.resource.securitygroup.map(x => x.id),
-        userdata: ''
+        userdata: '',
+        haenable: this.resource.haenable
       })
       this.rules = reactive({})
     },

ui/src/views/dashboard/UsageDashboard.vue

@@ -202,7 +202,7 @@
             <a-progress
             status="active"
             :percent="parseFloat(getPercentUsed(entity[usageType + 'total'], entity[usageType + 'limit']))"
-            :format="p => resource[item + 'limit'] !== '-1' && resource[item + 'limit'] !== 'Unlimited' ? p.toFixed(0) + '%' : ''"
+            :format="p => entity[usageType + 'limit'] !== '-1' && entity[usageType + 'limit'] !== 'Unlimited' ? p.toFixed(0) + '%' : ''"
             stroke-color="#52c41a"
             size="small"
             />
@@ -238,7 +238,7 @@
             <a-progress
             status="active"
             :percent="parseFloat(getPercentUsed(entity[usageType + 'total'], entity[usageType + 'limit']))"
-            :format="p => resource[item + 'limit'] !== '-1' && resource[item + 'limit'] !== 'Unlimited' ? p.toFixed(0) + '%' : ''"
+            :format="p => entity[usageType + 'limit'] !== '-1' && entity[usageType + 'limit'] !== 'Unlimited' ? p.toFixed(0) + '%' : ''"
             stroke-color="#52c41a"
             size="small"
             />
@@ -274,7 +274,7 @@
             <a-progress
             status="active"
             :percent="parseFloat(getPercentUsed(entity[usageType + 'total'], entity[usageType + 'limit']))"
-            :format="p => resource[item + 'limit'] !== '-1' && resource[item + 'limit'] !== 'Unlimited' ? p.toFixed(0) + '%' : ''"
+            :format="p => entity[usageType + 'limit'] !== '-1' && entity[usageType + 'limit'] !== 'Unlimited' ? p.toFixed(0) + '%' : ''"
             stroke-color="#52c41a"
             size="small"
             />