UI improvements

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -447,7 +447,6 @@ public class ApiConstants {
  public static final String SENT = "sent";
  public static final String SENT_BYTES = "sentbytes";
  public static final String SERIAL = "serial";
- public static final String SERVICE_IP = "serviceip";
  public static final String SERVICE_OFFERING_ID = "serviceofferingid";
  public static final String SESSIONKEY = "sessionkey";
  public static final String SHOW_CAPACITIES = "showcapacities";

api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java

@@ -74,9 +74,9 @@ public class ManagementServerResponse extends BaseResponse {
  @Param(description = "the running OS kernel version for this Management Server")
  private String kernelVersion;
 
- @SerializedName(ApiConstants.SERVICE_IP)
+ @SerializedName(ApiConstants.IP_ADDRESS)
  @Param(description = "the IP Address for this Management Server")
- private String serviceIp;
+ private String ipAddress;
 
  @SerializedName(ApiConstants.PEERS)
  @Param(description = "the Management Server Peers")
@@ -122,8 +122,8 @@ public Date getLastBoot() {
  return lastBoot;
  }
 
- public String getServiceIp() {
- return serviceIp;
+ public String getIpAddress() {
+ return ipAddress;
  }
 
  public void setId(String id) {
@@ -170,8 +170,8 @@ public void setKernelVersion(String kernelVersion) {
  this.kernelVersion = kernelVersion;
  }
 
- public void setServiceIp(String serviceIp) {
- this.serviceIp = serviceIp;
+ public void setIpAddress(String ipAddress) {
+ this.ipAddress = ipAddress;
  }
 
  public String getKernelVersion() {

engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql

@@ -23,6 +23,14 @@
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user', 'api_key_access', 'boolean DEFAULT NULL COMMENT "is api key access allowed for the user" AFTER `secret_key`');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.account', 'api_key_access', 'boolean DEFAULT NULL COMMENT "is api key access allowed for the account" ');
 
+-- Create a new group for Usage Server related configurations
+INSERT INTO `cloud`.`configuration_group` (`name`, `description`, `precedence`) VALUES ('Usage Server', 'Usage Server related configuration', 9);
+UPDATE `cloud`.`configuration_subgroup` set `group_id` = (SELECT `id` FROM `cloud`.`configuration_group` WHERE `name` = 'Usage Server'), `precedence` = 1 WHERE `name`='Usage';
+UPDATE `cloud`.`configuration` SET `group_id` = (SELECT `id` FROM `cloud`.`configuration_group` WHERE `name` = 'Usage Server') where `subgroup_id` = (SELECT `id` FROM `cloud`.`configuration_subgroup` WHERE `name` = 'Usage');
+
+-- Update the description to indicate this setting applies only to volume snapshots on running instances
+UPDATE `cloud`.`configuration` SET `description`='whether volume snapshot is enabled on running instances on KVM hosts' WHERE `name`='kvm.snapshot.enabled';
+
 -- Modify index for mshost_peer
 DELETE FROM `cloud`.`mshost_peer`;
 CALL `cloud`.`IDEMPOTENT_DROP_FOREIGN_KEY`('cloud.mshost_peer','fk_mshost_peer__owner_mshost');

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -5413,13 +5413,13 @@ protected ManagementServerResponse createManagementServerResponse(ManagementServ
  mgmtResponse.setLastServerStart(mgmt.getLastJvmStart());
  mgmtResponse.setLastServerStop(mgmt.getLastJvmStop());
  mgmtResponse.setLastBoot(mgmt.getLastSystemBoot());
- mgmtResponse.setServiceIp(mgmt.getServiceIP());
  if (listPeers) {
  List<ManagementServerHostPeerJoinVO> peers = mshostPeerJoinDao.listByOwnerMshostId(mgmt.getId());
  for (ManagementServerHostPeerJoinVO peer: peers) {
  mgmtResponse.addPeer(createPeerManagementServerNodeResponse(peer));
  }
  }
+ mgmtResponse.setIpAddress(mgmt.getServiceIP());
  mgmtResponse.setObjectName("managementserver");
  return mgmtResponse;
  }

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

@@ -506,7 +506,7 @@ public enum Config {
  "The time interval in seconds when the management server polls for snapshots to be scheduled.",
  null),
  SnapshotDeltaMax("Snapshots", SnapshotManager.class, Integer.class, "snapshot.delta.max", "16", "max delta snapshots between two full snapshots.", null),
- KVMSnapshotEnabled("Hidden", SnapshotManager.class, Boolean.class, "kvm.snapshot.enabled", "false", "whether snapshot is enabled for KVM hosts", null),
+ KVMSnapshotEnabled("Hidden", SnapshotManager.class, Boolean.class, "kvm.snapshot.enabled", "false", "Whether volume snapshot is enabled on running instances on a KVM host", null),
 
  // Advanced
  EventPurgeInterval(
@@ -665,8 +665,8 @@ public enum Config {
  ManagementServer.class,
  String.class,
  "hypervisor.list",
- HypervisorType.Hyperv + "," + HypervisorType.KVM + "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal + "," +
- HypervisorType.Ovm + "," + HypervisorType.LXC + "," + HypervisorType.Ovm3,
+ HypervisorType.KVM + "," + HypervisorType.VMware + "," + HypervisorType.XenServer + "," + HypervisorType.Hyperv + "," +
+ HypervisorType.BareMetal + "," + HypervisorType.Ovm + "," + HypervisorType.LXC + "," + HypervisorType.Ovm3,
  "The list of hypervisors that this deployment will use.",
  "hypervisorList",
  ConfigKey.Kind.CSV,

server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java

@@ -343,7 +343,7 @@ private void validateVpnConnectionDoesntExist(Site2SiteCustomerGateway customerG
  private void validatePrerequisiteVpnGateway(Site2SiteVpnGateway vpnGateway) {
  // check if gateway has been defined on the VPC
  if (_vpnGatewayDao.findByVpcId(vpnGateway.getVpcId()) == null) {
- throw new InvalidParameterValueException("we can not create a VPN connection for a VPC that does not have a VPN gateway defined");
+ throw new InvalidParameterValueException("We can not create a VPN connection for a VPC that does not have a VPN gateway defined");
  }
  }
 
@@ -590,7 +590,7 @@ public boolean deleteVpnConnection(DeleteVpnConnectionCmd cmd) throws ResourceUn
  private void stopVpnConnection(Long id) throws ResourceUnavailableException {
  Site2SiteVpnConnectionVO conn = _vpnConnectionDao.acquireInLockTable(id);
  if (conn == null) {
- throw new CloudRuntimeException("Unable to acquire lock for stopping of VPN connection with ID " + id);
+ throw new CloudRuntimeException("Unable to acquire lock for stopping VPN connection with ID " + id);
  }
  try {
  if (conn.getState() == State.Pending) {

server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java

@@ -27,6 +27,7 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.storage.snapshot.SnapshotManager;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiConstants;
@@ -377,9 +378,14 @@ public VMSnapshot allocVMSnapshot(Long vmId, String vsDisplayName, String vsDesc
  //StorageVMSnapshotStrategy - allows volume snapshots without memory; VM has to be in Running state; No limitation of the image format if the storage plugin supports volume snapshots; "kvm.vmstoragesnapshot.enabled" has to be enabled
  //Other Storage volume plugins could integrate this with their own functionality for group snapshots
  VMSnapshotStrategy snapshotStrategy = storageStrategyFactory.getVmSnapshotStrategy(userVmVo.getId(), rootVolumePool.getId(), snapshotMemory);
-
  if (snapshotStrategy == null) {
- String message = "KVM does not support the type of snapshot requested";
+ String message;
+ if (!SnapshotManager.VmStorageSnapshotKvm.value() && !snapshotMemory) {
+ message = "Creating a snapshot of a running KVM instance without memory is not supported";
+ } else {
+ message = "KVM does not support the type of snapshot requested";
+ }
+
  logger.debug(message);
  throw new CloudRuntimeException(message);
  }

ui/public/locales/de_DE.json

@@ -1265,7 +1265,6 @@
 "label.save.new.rule": "Neue Regel Speichern",
 "label.schedule": "Zeitplan",
 "label.scheduled.backups": "geplante Backups",
-"label.scheduled.snapshots": "geplante Schnappschüsse",
 "label.scope": "Geltungsbereich",
 "label.search": "Suche",
 "label.secondary.isolated.vlan.type.isolated": "Isoliert",

ui/public/locales/el_GR.json

@@ -1517,7 +1517,6 @@
 "label.scale.vm": "Κλίμακα εικονικής μηχανής",
 "label.schedule": "Πρόγραμμα",
 "label.scheduled.backups": "Προγραμματισμένα αντίγραφα ασφαλείας",
-"label.scheduled.snapshots": "Προγραμματισμένα στιγμιότυπα",
 "label.scope": "Πεδίο εφαρμογής",
 "label.search": "Αναζήτηση",
 "label.secondary.isolated.vlan.type.isolated": "Απομονωμένες",

ui/public/locales/en.json

@@ -54,6 +54,7 @@
 "label.action": "Action",
 "label.action.attach.disk": "Attach disk",
 "label.action.attach.iso": "Attach ISO",
+"label.action.attach.to.instance": "Attach to Instance",
 "label.action.bulk.delete.egress.firewall.rules": "Bulk delete egress firewall rules",
 "label.action.bulk.delete.firewall.rules": "Bulk delete firewall rules",
 "label.action.bulk.delete.ip.v6.firewall.rules": "Bulk remove IPv6 firewall rules",
@@ -399,9 +400,11 @@
 "label.associatednetworkid": "Associated Network ID",
 "label.associatednetworkname": "Network name",
 "label.asyncbackup": "Async backup",
+"label.attach.vol.to.instance": "Attach the created Volume to an existing Instance",
 "label.attaching": "Attaching",
 "label.authentication.method": "Authentication Method",
 "label.authentication.sshkey": "System SSH Key",
+"label.use.existing.vcenter.credentials.from.zone": "Use existing vCenter credentials from the Zone",
 "label.autoscale": "AutoScale",
 "label.autoscalevmgroupname": "AutoScaling Group",
 "label.author.email": "Author e-mail",
@@ -1073,7 +1076,7 @@
 "label.hastate": "HA state",
 "label.headers": "Headers",
 "label.header.backup.schedule": "You can set up recurring backup schedules by selecting from the available options below and applying your policy preference.",
-"label.header.volume.snapshot": "You can set up recurring Snapshot schedules by selecting from the available options below and applying your policy preference.",
+"label.header.volume.snapshot": "You can set up recurring Snapshots by selecting from the available options below and applying your policy preference.",
 "label.header.volume.take.snapshot": "Please confirm that you want to take a Snapshot of this volume.",
 "label.health.check": "Health check",
 "label.heapmemoryused": "Heap-memory used",
@@ -1999,7 +2002,6 @@
 "label.schedule": "Schedule",
 "label.schedule.add": "Add schedule",
 "label.scheduled.backups": "Scheduled backups",
-"label.scheduled.snapshots": "Scheduled Snapshots",
 "label.schedules": "Schedules",
 "label.scope": "Scope",
 "label.scope.tooltip": "Primary Storage Pool Scope",

ui/public/locales/ja_JP.json

@@ -1969,7 +1969,6 @@
  "label.scaleup.policy": "スケールアップポリシー",
  "label.schedule": "スケジュール",
  "label.scheduled.backups": "スケジュールされたバックアップ",
- "label.scheduled.snapshots": "スケジュールされたスナップショット",
  "label.scope": "スコープ",
  "label.search": "検索",
  "label.secondary.isolated.vlan.type.isolated": "隔離",

ui/public/locales/ko_KR.json

@@ -1322,7 +1322,6 @@
 "label.scale.vm": "VM \ud655\uc7a5",
 "label.schedule": "\uc2a4\ucf00\uc904",
 "label.scheduled.backups": "\uc608\uc57d\ub41c \ubc31\uc5c5",
-"label.scheduled.snapshots": "\uc608\uc57d\ub41c \uc2a4\ub0c5\uc0f7",
 "label.scope": "\ubc94\uc704",
 "label.search": "\uac80\uc0c9",
 "label.secondary.isolated.vlan.type.isolated": "isolated",

ui/public/locales/pt_BR.json

@@ -1428,7 +1428,6 @@
 "label.scale.vm": "Escalar VM",
 "label.schedule": "Programar",
 "label.scheduled.backups": "Backups programados",
-"label.scheduled.snapshots": "Snapshots programados",
 "label.scope": "Escopo",
 "label.search": "Pesquisar",
 "label.secondary.isolated.vlan.type.isolated": "Isolada",

ui/public/locales/zh_CN.json

@@ -2248,7 +2248,6 @@
 
  "label.schedule": "\u65E5\u7A0B",
  "label.scheduled.backups": "\u5B9A\u65F6\u5907\u4EFD",
- "label.scheduled.snapshots": "\u8BA1\u5212\u5FEB\u7167",
  "label.scope": "\u8303\u56F4",
  "label.search": "\u641C\u7D22",
 

ui/src/config/section/compute.js

@@ -207,9 +207,10 @@ export default {
  docHelp: 'adminguide/virtual_machines.html#virtual-machine-snapshots',
  dataView: true,
  popup: true,
- show: (record) => {
- return ((['Running'].includes(record.state) && record.hypervisor !== 'LXC') ||
- (['Stopped'].includes(record.state) && !['KVM', 'LXC'].includes(record.hypervisor)))
+ show: (record, store) => {
+ return (record.hypervisor !== 'KVM') ||
+ ['Stopped', 'Destroyed'].includes(record.state) ||
+ store.features.kvmsnapshotenabled
  },
  disabled: (record) => { return record.hostcontrolstate === 'Offline' && record.hypervisor === 'KVM' },
  component: shallowRef(defineAsyncComponent(() => import('@/views/compute/CreateSnapshotWizard.vue')))

ui/src/config/section/infra/managementServers.js

@@ -26,14 +26,14 @@ export default {
  permission: ['listManagementServersMetrics'],
  resourceType: 'ManagementServer',
  columns: () => {
- const fields = ['name', 'state', 'serviceip', 'version', 'osdistribution', 'agentcount']
+ const fields = ['name', 'state', 'ipaddress', 'version', 'osdistribution', 'agentcount']
  const metricsFields = ['collectiontime', 'availableprocessors', 'cpuload', 'heapmemoryused']
  if (store.getters.metrics) {
  fields.push(...metricsFields)
  }
  return fields
  },
- details: ['collectiontime', 'usageislocal', 'dbislocal', 'lastserverstart', 'lastserverstop', 'lastboottime', 'version', 'loginfo', 'systemtotalcpucycles', 'systemloadaverages', 'systemcycleusage', 'systemmemorytotal', 'systemmemoryfree', 'systemmemoryvirtualsize', 'availableprocessors', 'javadistribution', 'javaversion', 'osdistribution', 'kernelversion', 'agentcount', 'sessions', 'heapmemoryused', 'heapmemorytotal', 'threadsblockedcount', 'threadsdeamoncount', 'threadsnewcount', 'threadsrunnablecount', 'threadsterminatedcount', 'threadstotalcount', 'threadswaitingcount'],
+ details: ['ipaddress', 'collectiontime', 'usageislocal', 'dbislocal', 'lastserverstart', 'lastserverstop', 'lastboottime', 'version', 'loginfo', 'systemtotalcpucycles', 'systemloadaverages', 'systemcycleusage', 'systemmemorytotal', 'systemmemoryfree', 'systemmemoryvirtualsize', 'availableprocessors', 'javadistribution', 'javaversion', 'osdistribution', 'kernelversion', 'agentcount', 'sessions', 'heapmemoryused', 'heapmemorytotal', 'threadsblockedcount', 'threadsdeamoncount', 'threadsnewcount', 'threadsrunnablecount', 'threadsterminatedcount', 'threadstotalcount', 'threadswaitingcount'],
  tabs: [
  {
  name: 'details',

ui/src/config/section/storage.js

@@ -165,9 +165,10 @@ export default {
  label: 'label.action.take.snapshot',
  dataView: true,
  show: (record, store) => {
- return record.state === 'Ready' && (record.hypervisor !== 'KVM' ||
- record.hypervisor === 'KVM' && record.vmstate === 'Running' && store.features.kvmsnapshotenabled ||
- record.hypervisor === 'KVM' && record.vmstate !== 'Running')
+ return record.state === 'Ready' &&
+ (record.hypervisor !== 'KVM' ||
+ ['Stopped', 'Destroyed'].includes(record.vmstate) ||
+ store.features.kvmsnapshotenabled)
  },
  popup: true,
  component: shallowRef(defineAsyncComponent(() => import('@/views/storage/TakeSnapshot.vue')))
@@ -179,9 +180,10 @@ export default {
  label: 'label.action.recurring.snapshot',
  dataView: true,
  show: (record, store) => {
- return record.state === 'Ready' && (record.hypervisor !== 'KVM' ||
- record.hypervisor === 'KVM' && record.vmstate === 'Running' && store.features.kvmsnapshotenabled ||
- record.hypervisor === 'KVM' && record.vmstate !== 'Running')
+ return record.state === 'Ready' &&
+ (record.hypervisor !== 'KVM' ||
+ (['Stopped', 'Destroyed'].includes(record.vmstate)) ||
+ (store.features.kvmsnapshotenabled))
  },
  popup: true,
  component: shallowRef(defineAsyncComponent(() => import('@/views/storage/RecurringSnapshotVolume.vue'))),