Merge branch '4.19' into 4.20

Author: Dahn Highland

Diff for: plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java

@@ -54,7 +54,7 @@ public Answer execute(final FenceCommand command, final XenServer56Resource xenS
             for (final VM vm : vms) {
                 logger.info("Fence command for VM " + command.getVmName());
                 vm.powerStateReset(conn);
-                vm.destroy(conn);
+                xenServer56.destroyVm(vm, conn);
             }
             return new FenceAnswer(command);
         } catch (final XmlRpcException e) {

Diff for: plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56FenceCommandWrapper.java

@@ -66,7 +66,7 @@ public Answer execute(final FenceCommand command, final XenServer56Resource xenS
                 }
                 logger.info("Fence command for VM " + command.getVmName());
                 vm.powerStateReset(conn);
-                vm.destroy(conn);
+                xenServer56.destroyVm(vm, conn);
                 for (final VDI vdi : vdis) {
                     final Map<String, String> smConfig = vdi.getSmConfig(conn);
                     for (final String key : smConfig.keySet()) {

Diff for: plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56p1/XenServer56FP1FenceCommandWrapper.java

@@ -69,7 +69,7 @@ public Answer execute(final CreateVMSnapshotCommand command, final CitrixResourc
         try {
             // check if VM snapshot already exists
             final Set<VM> vmSnapshots = VM.getByNameLabel(conn, command.getTarget().getSnapshotName());
-            if (vmSnapshots == null || vmSnapshots.size() > 0) {
+            if (vmSnapshots == null || !vmSnapshots.isEmpty()) {
                 return new CreateVMSnapshotAnswer(command, command.getTarget(), command.getVolumeTOs());
             }
 
@@ -98,6 +98,7 @@ public Answer execute(final CreateVMSnapshotCommand command, final CitrixResourc
                     vm = citrixResourceBase.getVM(conn, vmName);
                     vmState = vm.getPowerState(conn);
                 } catch (final Exception e) {
+                    logger.debug("Failed to find VM with name: {} due to:", vmName, e);
                     if (!snapshotMemory) {
                         vm = citrixResourceBase.createWorkingVM(conn, vmName, guestOSType, platformEmulator, listVolumeTo);
                     }
@@ -107,7 +108,7 @@ public Answer execute(final CreateVMSnapshotCommand command, final CitrixResourc
                     return new CreateVMSnapshotAnswer(command, false, "Creating VM Snapshot Failed due to can not find vm: " + vmName);
                 }
 
-                // call Xenserver API
+                // call XenServer API
                 if (!snapshotMemory) {
                     task = vm.snapshotAsync(conn, vmSnapshotName);
                 } else {
@@ -136,15 +137,15 @@ public Answer execute(final CreateVMSnapshotCommand command, final CitrixResourc
             vmSnapshot = Types.toVM(ref);
             try {
                 Thread.sleep(5000);
-            } catch (final InterruptedException ex) {
+            } catch (final InterruptedException ignored) {
 
             }
             // calculate used capacity for this VM snapshot
             for (final VolumeObjectTO volumeTo : command.getVolumeTOs()) {
                 try {
                     final long size = citrixResourceBase.getVMSnapshotChainSize(conn, volumeTo, command.getVmName(), vmSnapshotName);
                     volumeTo.setSize(size);
-                } catch (final CloudRuntimeException cre) {
+                } catch (final CloudRuntimeException ignored) {
                 }
             }
 
@@ -161,13 +162,13 @@ public Answer execute(final CreateVMSnapshotCommand command, final CitrixResourc
             } else {
                 msg = e.toString();
             }
-            logger.warn("Creating VM Snapshot " + command.getTarget().getSnapshotName() + " failed due to: " + msg, e);
+            logger.warn("Creating VM Snapshot {} failed due to: {}", command.getTarget().getSnapshotName(), msg, e);
             return new CreateVMSnapshotAnswer(command, false, msg);
         } finally {
             try {
                 if (!success) {
                     if (vmSnapshot != null) {
-                        logger.debug("Delete existing VM Snapshot " + vmSnapshotName + " after making VolumeTO failed");
+                        logger.debug("Delete existing VM Snapshot {} after making VolumeTO failed", vmSnapshotName);
                         final Set<VBD> vbds = vmSnapshot.getVBDs(conn);
                         for (final VBD vbd : vbds) {
                             final VBD.Record vbdr = vbd.getRecord(conn);
@@ -176,16 +177,14 @@ public Answer execute(final CreateVMSnapshotCommand command, final CitrixResourc
                                 vdi.destroy(conn);
                             }
                         }
-                        vmSnapshot.destroy(conn);
+                        citrixResourceBase.destroyVm(vmSnapshot, conn, true);
                     }
                 }
-                if (vmState == VmPowerState.HALTED) {
-                    if (vm != null) {
-                        vm.destroy(conn);
-                    }
+                if (vmState == VmPowerState.HALTED && vm != null) {
+                    citrixResourceBase.destroyVm(vm, conn);
                 }
             } catch (final Exception e2) {
-                logger.error("delete snapshot error due to " + e2.getMessage());
+                logger.error("delete snapshot error due to {}", e2.getMessage());
             }
         }
     }

Diff for: plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java

@@ -66,7 +66,7 @@ public Answer execute(final DeleteVMSnapshotCommand command, final CitrixResourc
             if (command.getTarget().getType() == VMSnapshot.Type.DiskAndMemory) {
                 vdiList.add(snapshot.getSuspendVDI(conn));
             }
-            snapshot.destroy(conn);
+            citrixResourceBase.destroyVm(snapshot, conn, true);
             for (final VDI vdi : vdiList) {
                 vdi.destroy(conn);
             }

Diff for: plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java

@@ -51,12 +51,12 @@ public Answer execute(final RevertToVMSnapshotCommand command, final CitrixResou
         final VMSnapshot.Type vmSnapshotType = command.getTarget().getType();
         final Boolean snapshotMemory = vmSnapshotType == VMSnapshot.Type.DiskAndMemory;
         final Connection conn = citrixResourceBase.getConnection();
-        PowerState vmState = null;
-        VM vm = null;
+        PowerState vmState;
+        VM vm;
         try {
 
             final Set<VM> vmSnapshots = VM.getByNameLabel(conn, command.getTarget().getSnapshotName());
-            if (vmSnapshots == null || vmSnapshots.size() == 0) {
+            if (vmSnapshots == null || vmSnapshots.isEmpty()) {
                 return new RevertToVMSnapshotAnswer(command, false, "Cannot find vmSnapshot with name: " + command.getTarget().getSnapshotName());
             }
 
@@ -66,6 +66,7 @@ public Answer execute(final RevertToVMSnapshotCommand command, final CitrixResou
             try {
                 vm = citrixResourceBase.getVM(conn, vmName);
             } catch (final Exception e) {
+                logger.debug("Failed to find VM with name: {} due to:", vmName, e);
                 vm = citrixResourceBase.createWorkingVM(conn, vmName, command.getGuestOSType(), command.getPlatformEmulator(), listVolumeTo);
             }
 
@@ -77,7 +78,7 @@ public Answer execute(final RevertToVMSnapshotCommand command, final CitrixResou
             citrixResourceBase.revertToSnapshot(conn, vmSnapshot, vmName, vm.getUuid(conn), snapshotMemory, citrixResourceBase.getHost().getUuid());
             vm = citrixResourceBase.getVM(conn, vmName);
             final Set<VBD> vbds = vm.getVBDs(conn);
-            final Map<String, VDI> vdiMap = new HashMap<String, VDI>();
+            final Map<String, VDI> vdiMap = new HashMap<>();
             // get vdi:vbdr to a map
             for (final VBD vbd : vbds) {
                 final VBD.Record vbdr = vbd.getRecord(conn);
@@ -88,7 +89,7 @@ public Answer execute(final RevertToVMSnapshotCommand command, final CitrixResou
             }
 
             if (!snapshotMemory) {
-                vm.destroy(conn);
+                citrixResourceBase.destroyVm(vm, conn);
                 vmState = PowerState.PowerOff;
             } else {
                 vmState = PowerState.PowerOn;
@@ -103,7 +104,7 @@ public Answer execute(final RevertToVMSnapshotCommand command, final CitrixResou
 
             return new RevertToVMSnapshotAnswer(command, listVolumeTo, vmState);
         } catch (final Exception e) {
-            logger.error("revert vm " + vmName + " to snapshot " + command.getTarget().getSnapshotName() + " failed due to " + e.getMessage());
+            logger.error("revert vm {} to snapshot {} failed due to {}", vmName, command.getTarget().getSnapshotName(), e.getMessage());
             return new RevertToVMSnapshotAnswer(command, false, e.getMessage());
         }
     }

Diff for: plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java

@@ -73,7 +73,7 @@ public Answer execute(final StartCommand command, final CitrixResourceBase citri
                 for (final VM v : vms) {
                     final VM.Record vRec = v.getRecord(conn);
                     if (vRec.powerState == VmPowerState.HALTED) {
-                        v.destroy(conn);
+                        citrixResourceBase.destroyVm(v, conn, true);
                     } else if (vRec.powerState == VmPowerState.RUNNING) {
                         final String host = vRec.residentOn.getUuid(conn);
                         final String msg = "VM " + vmName + " is runing on host " + host;

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

@@ -141,7 +141,7 @@ public Answer execute(final StopCommand command, final CitrixResourceBase citrix
                             for (final VIF vif : vifs) {
                                 networks.add(vif.getNetwork(conn));
                             }
-                            vm.destroy(conn);
+                            citrixResourceBase.destroyVm(vm, conn);
                             final SR sr = citrixResourceBase.getISOSRbyVmName(conn, command.getVmName(), false);
                             citrixResourceBase.removeSR(conn, sr);
                             final SR configDriveSR = citrixResourceBase.getISOSRbyVmName(conn, command.getVmName(), true);

Diff for: plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java

@@ -625,9 +625,9 @@
 "label.create.template": "Create Template",
 "label.create.tier.aclid.description": "The ACL associated with the Network Tier.",
 "label.create.tier.externalid.description": "ID of the Network in an external system.",
-"label.create.tier.gateway.description": "The Network Tier's gateway in the super CIDR range, not overlapping with the CIDR of other Network Tiers in this VPC.",
+"label.create.tier.gateway.description": "Gateway IP must be within VPC CIDR ({value})",
 "label.create.tier.name.description": "A unique name for the Network Tier.",
-"label.create.tier.netmask.description": "The Network Tier's netmask. For example 255.255.255.0",
+"label.create.tier.netmask.description": "Network Tier's netmask must be more restrictive than {value}",
 "label.create.tier.networkofferingid.description": "The Network offering for the Network Tier.",
 "label.create.tungsten.routing.policy": "Create Tungsten-Fabric routing policy",
 "label.create.user": "Create User",

Diff for: ui/public/locales/en.json

@@ -27,7 +27,7 @@
     >
       <div v-for="(item, index) in dataResource" :key="index">
         <a-form-item
-          v-if="item.resourcetypename !== 'project'"
+          v-if="item.resourcetypename !== 'project' || !$route.path.startsWith('/project')"
           :v-bind="item.resourcetypename"
           :label="$t('label.max' + (item.resourcetypename ? item.resourcetypename.replace('_', '') : '')) + (item.tag ? ' [' + item.tag + ']': '')"
           :name="item.key"

Diff for: ui/src/components/view/ResourceLimitTab.vue

@@ -0,0 +1,51 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+// Parsing CIDR into Gateway,Netmask Placeholders
+
+export function getNetmaskFromCidr (cidr) {
+  if (!cidr?.includes('/')) return undefined
+  const [, maskBits] = cidr.split('/')
+  const subnetMasks = {
+    8: '255.0.0.0',
+    9: '255.128.0.0',
+    10: '255.192.0.0',
+    11: '255.224.0.0',
+    12: '255.240.0.0',
+    13: '255.248.0.0',
+    14: '255.252.0.0',
+    15: '255.254.0.0',
+    16: '255.255.0.0',
+    17: '255.255.128.0',
+    18: '255.255.192.0',
+    19: '255.255.224.0',
+    20: '255.255.240.0',
+    21: '255.255.248.0',
+    22: '255.255.252.0',
+    23: '255.255.254.0',
+    24: '255.255.255.0',
+    25: '255.255.255.128',
+    26: '255.255.255.192',
+    27: '255.255.255.224',
+    28: '255.255.255.240',
+    29: '255.255.255.248',
+    30: '255.255.255.252',
+    31: '255.255.255.254',
+    32: '255.255.255.255'
+  }
+  return subnetMasks[+maskBits] || '255.255.255.0'
+}

Diff for: ui/src/utils/network.js

@@ -460,9 +460,13 @@ export default {
     },
     listProject () {
       this.loading = true
-      api('listProjects', { id: store.getters.project.id }).then(json => {
+      const params = {
+        id: store.getters.project.id,
+        listall: true
+      }
+      api('listProjects', params).then(json => {
         this.loading = false
-        if (json && json.listprojectsresponse && json.listprojectsresponse.project) {
+        if (json?.listprojectsresponse?.project) {
           this.project = json.listprojectsresponse.project[0]
         }
       })

Diff for: ui/src/views/dashboard/UsageDashboard.vue

@@ -242,18 +242,18 @@
           </a-form-item>
           <a-form-item ref="gateway" name="gateway" :colon="false">
             <template #label>
-              <tooltip-label :title="$t('label.gateway')" :tooltip="$t('label.create.tier.gateway.description')"/>
+              <tooltip-label :title="$t('label.gateway')" :tooltip="gatewayPlaceholder"/>
             </template>
             <a-input
-              :placeholder="$t('label.create.tier.gateway.description')"
+              :placeholder="gatewayPlaceholder"
               v-model:value="form.gateway"></a-input>
           </a-form-item>
           <a-form-item ref="netmask" name="netmask" :colon="false">
             <template #label>
-              <tooltip-label :title="$t('label.netmask')" :tooltip="$t('label.create.tier.netmask.description')"/>
+              <tooltip-label :title="$t('label.netmask')" :tooltip="netmaskPlaceholder"/>
             </template>
             <a-input
-              :placeholder="$t('label.create.tier.netmask.description')"
+              :placeholder="netmaskPlaceholder"
               v-model:value="form.netmask"></a-input>
           </a-form-item>
           <a-form-item ref="externalId" name="externalId" :colon="false">
@@ -363,6 +363,7 @@ import { api } from '@/api'
 import { mixinForm } from '@/utils/mixin'
 import Status from '@/components/widgets/Status'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import { getNetmaskFromCidr } from '@/utils/network'
 
 export default {
   name: 'VpcTiersTab',
@@ -400,6 +401,8 @@ export default {
       selectedNetworkOffering: {},
       privateMtuMax: 1500,
       errorPrivateMtu: '',
+      gatewayPlaceholder: '',
+      netmaskPlaceholder: '',
       algorithms: {
         Source: 'source',
         'Round-robin': 'roundrobin',
@@ -696,6 +699,13 @@ export default {
       this.initForm()
       this.fetchNetworkAclList()
       this.fetchNetworkOfferings()
+      const cidr = this.resource.cidr
+      const netmask = getNetmaskFromCidr(cidr)
+      if (netmask) {
+        this.gatewayPlaceholder = this.$t('label.create.tier.gateway.description', { value: cidr })
+        this.netmaskPlaceholder = this.$t('label.create.tier.netmask.description', { value: netmask })
+      }
+
       this.showCreateNetworkModal = true
       this.rules = {
         name: [{ required: true, message: this.$t('label.required') }],