This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new a88967bf617 Minor naming changes in Shared FileSystems 4.20 Feature
(#9675)
a88967bf617 is described below
commit a88967bf617085fa0186f4d2f670b473687d2354
Author: Abhisar Sinha <63767682+abh1...@users.noreply.github.com>
AuthorDate: Tue Sep 17 12:23:50 2024 +0530
Minor naming changes in Shared FileSystems 4.20 Feature (#9675)
---
.../sharedfs/ChangeSharedFSServiceOfferingCmd.java | 2 +-
.../user/storage/sharedfs/CreateSharedFSCmd.java | 2 +-
.../api/response/CapabilitiesResponse.java | 4 +-
.../cloudstack/storage/sharedfs/SharedFS.java | 2 +-
.../resources/META-INF/db/schema-41910to42000.sql | 198 ---------------------
.../com/cloud/storage/VolumeApiServiceImpl.java | 6 +-
.../com/cloud/template/TemplateManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 18 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 2 +-
.../affinity/AffinityGroupServiceImpl.java | 2 +-
.../cloudstack/backup/BackupManagerImpl.java | 8 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +-
ui/public/locales/en.json | 6 +-
ui/src/config/section/storage.js | 2 +-
ui/src/views/storage/CreateSharedFS.vue | 2 +-
15 files changed, 30 insertions(+), 228 deletions(-)
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ChangeSharedFSServiceOfferingCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ChangeSharedFSServiceOfferingCmd.java
index 58269a5bd33..70fb543d64c 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ChangeSharedFSServiceOfferingCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ChangeSharedFSServiceOfferingCmd.java
@@ -70,7 +70,7 @@ public class ChangeSharedFSServiceOfferingCmd extends
BaseAsyncCmd implements Us
type = CommandType.UUID,
entityType = ServiceOfferingResponse.class,
required = true,
- description = "the offering to use for the shared filesystem vm")
+ description = "the offering to use for the shared filesystem
instance")
private Long serviceOfferingId;
/////////////////////////////////////////////////////
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/CreateSharedFSCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/CreateSharedFSCmd.java
index 1be55fdab1c..ddaa31612a8 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/CreateSharedFSCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/CreateSharedFSCmd.java
@@ -130,7 +130,7 @@ public class CreateSharedFSCmd extends BaseAsyncCreateCmd
implements UserCmd {
type = CommandType.UUID,
required = true,
entityType = ServiceOfferingResponse.class,
- description = "the service offering to use for the shared
filesystem VM hosting the data. The offering should be HA enabled and the cpu
count and memory size should be greater than equal to sharedfsvm.min.cpu.count
and sharedfsvm.min.ram.size respectively")
+ description = "the service offering to use for the shared
filesystem instance hosting the data. The offering should be HA enabled and the
cpu count and memory size should be greater than equal to
sharedfsvm.min.cpu.count and sharedfsvm.min.ram.size respectively")
private Long serviceOfferingId;
@Parameter(name = ApiConstants.FILESYSTEM,
diff --git
a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
index 26dc4bcffd2..3861ac455ed 100644
---
a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
+++
b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
@@ -129,11 +129,11 @@ public class CapabilitiesResponse extends BaseResponse {
private Integer instancesDisksStatsRetentionTime;
@SerializedName(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT)
- @Param(description = "the min CPU count for the service offering used by
the shared filesystem VM", since = "4.20.0")
+ @Param(description = "the min CPU count for the service offering used by
the shared filesystem instance", since = "4.20.0")
private Integer sharedFsVmMinCpuCount;
@SerializedName(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE)
- @Param(description = "the min Ram size for the service offering used by
the shared filesystem VM", since = "4.20.0")
+ @Param(description = "the min Ram size for the service offering used by
the shared filesystem instance", since = "4.20.0")
private Integer sharedFsVmMinRamSize;
public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
diff --git
a/api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFS.java
b/api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFS.java
index 12ce5eb387b..bcba425abbf 100644
--- a/api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFS.java
+++ b/api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFS.java
@@ -64,7 +64,7 @@ public interface SharedFS extends ControlledEntity, Identity,
InternalIdentity,
null,
SharedFSFeatureEnabled.key());
- String SharedFSVmNamePrefix = "fsvm";
+ String SharedFSVmNamePrefix = "sharedfs";
String SharedFSPath = "/export";
enum FileSystemType {
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
b/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
index 8f0076ad46b..a9f7b394e02 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
@@ -307,204 +307,6 @@ CREATE TABLE `cloud`.`shared_filesystem`(
INDEX `i_shared_filesystem__domain_id`(`domain_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
-CREATE VIEW `user_vm_view` AS
-SELECT
- `vm_instance`.`id` AS `id`,
- `vm_instance`.`name` AS `name`,
- `user_vm`.`display_name` AS `display_name`,
- `user_vm`.`user_data` AS `user_data`,
- `user_vm`.`user_vm_type` AS `user_vm_type`,
- `account`.`id` AS `account_id`,
- `account`.`uuid` AS `account_uuid`,
- `account`.`account_name` AS `account_name`,
- `account`.`type` AS `account_type`,
- `domain`.`id` AS `domain_id`,
- `domain`.`uuid` AS `domain_uuid`,
- `domain`.`name` AS `domain_name`,
- `domain`.`path` AS `domain_path`,
- `projects`.`id` AS `project_id`,
- `projects`.`uuid` AS `project_uuid`,
- `projects`.`name` AS `project_name`,
- `instance_group`.`id` AS `instance_group_id`,
- `instance_group`.`uuid` AS `instance_group_uuid`,
- `instance_group`.`name` AS `instance_group_name`,
- `vm_instance`.`uuid` AS `uuid`,
- `vm_instance`.`user_id` AS `user_id`,
- `vm_instance`.`last_host_id` AS `last_host_id`,
- `vm_instance`.`vm_type` AS `type`,
- `vm_instance`.`limit_cpu_use` AS `limit_cpu_use`,
- `vm_instance`.`created` AS `created`,
- `vm_instance`.`state` AS `state`,
- `vm_instance`.`update_time` AS `update_time`,
- `vm_instance`.`removed` AS `removed`,
- `vm_instance`.`ha_enabled` AS `ha_enabled`,
- `vm_instance`.`hypervisor_type` AS `hypervisor_type`,
- `vm_instance`.`instance_name` AS `instance_name`,
- `vm_instance`.`guest_os_id` AS `guest_os_id`,
- `vm_instance`.`display_vm` AS `display_vm`,
- `guest_os`.`uuid` AS `guest_os_uuid`,
- `vm_instance`.`pod_id` AS `pod_id`,
- `host_pod_ref`.`uuid` AS `pod_uuid`,
- `vm_instance`.`private_ip_address` AS `private_ip_address`,
- `vm_instance`.`private_mac_address` AS `private_mac_address`,
- `vm_instance`.`vm_type` AS `vm_type`,
- `data_center`.`id` AS `data_center_id`,
- `data_center`.`uuid` AS `data_center_uuid`,
- `data_center`.`name` AS `data_center_name`,
- `data_center`.`is_security_group_enabled` AS `security_group_enabled`,
- `data_center`.`networktype` AS `data_center_network_type`,
- `host`.`id` AS `host_id`,
- `host`.`uuid` AS `host_uuid`,
- `host`.`name` AS `host_name`,
- `host`.`cluster_id` AS `cluster_id`,
- `host`.`status` AS `host_status`,
- `host`.`resource_state` AS `host_resource_state`,
- `vm_template`.`id` AS `template_id`,
- `vm_template`.`uuid` AS `template_uuid`,
- `vm_template`.`name` AS `template_name`,
- `vm_template`.`type` AS `template_type`,
- `vm_template`.`format` AS `template_format`,
- `vm_template`.`display_text` AS `template_display_text`,
- `vm_template`.`enable_password` AS `password_enabled`,
- `iso`.`id` AS `iso_id`,
- `iso`.`uuid` AS `iso_uuid`,
- `iso`.`name` AS `iso_name`,
- `iso`.`display_text` AS `iso_display_text`,
- `service_offering`.`id` AS `service_offering_id`,
- `service_offering`.`uuid` AS `service_offering_uuid`,
- `disk_offering`.`uuid` AS `disk_offering_uuid`,
- `disk_offering`.`id` AS `disk_offering_id`,
- (CASE
- WHEN ISNULL(`service_offering`.`cpu`) THEN `custom_cpu`.`value`
- ELSE `service_offering`.`cpu`
- END) AS `cpu`,
- (CASE
- WHEN ISNULL(`service_offering`.`speed`) THEN `custom_speed`.`value`
- ELSE `service_offering`.`speed`
- END) AS `speed`,
- (CASE
- WHEN ISNULL(`service_offering`.`ram_size`) THEN
`custom_ram_size`.`value`
- ELSE `service_offering`.`ram_size`
- END) AS `ram_size`,
- `backup_offering`.`uuid` AS `backup_offering_uuid`,
- `backup_offering`.`id` AS `backup_offering_id`,
- `service_offering`.`name` AS `service_offering_name`,
- `disk_offering`.`name` AS `disk_offering_name`,
- `backup_offering`.`name` AS `backup_offering_name`,
- `storage_pool`.`id` AS `pool_id`,
- `storage_pool`.`uuid` AS `pool_uuid`,
- `storage_pool`.`pool_type` AS `pool_type`,
- `volumes`.`id` AS `volume_id`,
- `volumes`.`uuid` AS `volume_uuid`,
- `volumes`.`device_id` AS `volume_device_id`,
- `volumes`.`volume_type` AS `volume_type`,
- `security_group`.`id` AS `security_group_id`,
- `security_group`.`uuid` AS `security_group_uuid`,
- `security_group`.`name` AS `security_group_name`,
- `security_group`.`description` AS `security_group_description`,
- `nics`.`id` AS `nic_id`,
- `nics`.`uuid` AS `nic_uuid`,
- `nics`.`device_id` AS `nic_device_id`,
- `nics`.`network_id` AS `network_id`,
- `nics`.`ip4_address` AS `ip_address`,
- `nics`.`ip6_address` AS `ip6_address`,
- `nics`.`ip6_gateway` AS `ip6_gateway`,
- `nics`.`ip6_cidr` AS `ip6_cidr`,
- `nics`.`default_nic` AS `is_default_nic`,
- `nics`.`gateway` AS `gateway`,
- `nics`.`netmask` AS `netmask`,
- `nics`.`mac_address` AS `mac_address`,
- `nics`.`broadcast_uri` AS `broadcast_uri`,
- `nics`.`isolation_uri` AS `isolation_uri`,
- `vpc`.`id` AS `vpc_id`,
- `vpc`.`uuid` AS `vpc_uuid`,
- `networks`.`uuid` AS `network_uuid`,
- `networks`.`name` AS `network_name`,
- `networks`.`traffic_type` AS `traffic_type`,
- `networks`.`guest_type` AS `guest_type`,
- `user_ip_address`.`id` AS `public_ip_id`,
- `user_ip_address`.`uuid` AS `public_ip_uuid`,
- `user_ip_address`.`public_ip_address` AS `public_ip_address`,
- `ssh_details`.`value` AS `keypair_names`,
- `resource_tags`.`id` AS `tag_id`,
- `resource_tags`.`uuid` AS `tag_uuid`,
- `resource_tags`.`key` AS `tag_key`,
- `resource_tags`.`value` AS `tag_value`,
- `resource_tags`.`domain_id` AS `tag_domain_id`,
- `domain`.`uuid` AS `tag_domain_uuid`,
- `domain`.`name` AS `tag_domain_name`,
- `resource_tags`.`account_id` AS `tag_account_id`,
- `account`.`account_name` AS `tag_account_name`,
- `resource_tags`.`resource_id` AS `tag_resource_id`,
- `resource_tags`.`resource_uuid` AS `tag_resource_uuid`,
- `resource_tags`.`resource_type` AS `tag_resource_type`,
- `resource_tags`.`customer` AS `tag_customer`,
- `async_job`.`id` AS `job_id`,
- `async_job`.`uuid` AS `job_uuid`,
- `async_job`.`job_status` AS `job_status`,
- `async_job`.`account_id` AS `job_account_id`,
- `affinity_group`.`id` AS `affinity_group_id`,
- `affinity_group`.`uuid` AS `affinity_group_uuid`,
- `affinity_group`.`name` AS `affinity_group_name`,
- `affinity_group`.`description` AS `affinity_group_description`,
- `autoscale_vmgroups`.`id` AS `autoscale_vmgroup_id`,
- `autoscale_vmgroups`.`uuid` AS `autoscale_vmgroup_uuid`,
- `autoscale_vmgroups`.`name` AS `autoscale_vmgroup_name`,
- `vm_instance`.`dynamically_scalable` AS `dynamically_scalable`,
- `user_data`.`id` AS `user_data_id`,
- `user_data`.`uuid` AS `user_data_uuid`,
- `user_data`.`name` AS `user_data_name`,
- `user_vm`.`user_data_details` AS `user_data_details`,
- `vm_template`.`user_data_link_policy` AS `user_data_policy`
-FROM
- (((((((((((((((((((((((((((((((((((`user_vm`
- JOIN `vm_instance` ON (((`vm_instance`.`id` = `user_vm`.`id`)
- AND ISNULL(`vm_instance`.`removed`))))
- JOIN `account` ON ((`vm_instance`.`account_id` = `account`.`id`)))
- JOIN `domain` ON ((`vm_instance`.`domain_id` = `domain`.`id`)))
- LEFT JOIN `guest_os` ON ((`vm_instance`.`guest_os_id` =
`guest_os`.`id`)))
- LEFT JOIN `host_pod_ref` ON ((`vm_instance`.`pod_id` =
`host_pod_ref`.`id`)))
- LEFT JOIN `projects` ON ((`projects`.`project_account_id` =
`account`.`id`)))
- LEFT JOIN `instance_group_vm_map` ON ((`vm_instance`.`id` =
`instance_group_vm_map`.`instance_id`)))
- LEFT JOIN `instance_group` ON ((`instance_group_vm_map`.`group_id` =
`instance_group`.`id`)))
- LEFT JOIN `data_center` ON ((`vm_instance`.`data_center_id` =
`data_center`.`id`)))
- LEFT JOIN `host` ON ((`vm_instance`.`host_id` = `host`.`id`)))
- LEFT JOIN `vm_template` ON ((`vm_instance`.`vm_template_id` =
`vm_template`.`id`)))
- LEFT JOIN `vm_template` `iso` ON ((`iso`.`id` = `user_vm`.`iso_id`)))
- LEFT JOIN `volumes` ON ((`vm_instance`.`id` =
`volumes`.`instance_id`)))
- LEFT JOIN `service_offering` ON ((`vm_instance`.`service_offering_id`
= `service_offering`.`id`)))
- LEFT JOIN `disk_offering` `svc_disk_offering` ON
((`volumes`.`disk_offering_id` = `svc_disk_offering`.`id`)))
- LEFT JOIN `disk_offering` ON ((`volumes`.`disk_offering_id` =
`disk_offering`.`id`)))
- LEFT JOIN `backup_offering` ON ((`vm_instance`.`backup_offering_id` =
`backup_offering`.`id`)))
- LEFT JOIN `storage_pool` ON ((`volumes`.`pool_id` =
`storage_pool`.`id`)))
- LEFT JOIN `security_group_vm_map` ON ((`vm_instance`.`id` =
`security_group_vm_map`.`instance_id`)))
- LEFT JOIN `security_group` ON
((`security_group_vm_map`.`security_group_id` = `security_group`.`id`)))
- LEFT JOIN `user_data` ON ((`user_data`.`id` =
`user_vm`.`user_data_id`)))
- LEFT JOIN `nics` ON (((`vm_instance`.`id` = `nics`.`instance_id`)
- AND ISNULL(`nics`.`removed`))))
- LEFT JOIN `networks` ON ((`nics`.`network_id` = `networks`.`id`)))
- LEFT JOIN `vpc` ON (((`networks`.`vpc_id` = `vpc`.`id`)
- AND ISNULL(`vpc`.`removed`))))
- LEFT JOIN `user_ip_address` FORCE INDEX(`fk_user_ip_address__vm_id`)
ON ((`user_ip_address`.`vm_id` = `vm_instance`.`id`)))
- LEFT JOIN `user_vm_details` `ssh_details` ON (((`ssh_details`.`vm_id`
= `vm_instance`.`id`)
- AND (`ssh_details`.`name` = 'SSH.KeyPairNames'))))
- LEFT JOIN `resource_tags` ON (((`resource_tags`.`resource_id` =
`vm_instance`.`id`)
- AND (`resource_tags`.`resource_type` = 'UserVm'))))
- LEFT JOIN `async_job` ON (((`async_job`.`instance_id` =
`vm_instance`.`id`)
- AND (`async_job`.`instance_type` = 'VirtualMachine')
- AND (`async_job`.`job_status` = 0))))
- LEFT JOIN `affinity_group_vm_map` ON ((`vm_instance`.`id` =
`affinity_group_vm_map`.`instance_id`)))
- LEFT JOIN `affinity_group` ON
((`affinity_group_vm_map`.`affinity_group_id` = `affinity_group`.`id`)))
- LEFT JOIN `autoscale_vmgroup_vm_map` ON
((`autoscale_vmgroup_vm_map`.`instance_id` = `vm_instance`.`id`)))
- LEFT JOIN `autoscale_vmgroups` ON
((`autoscale_vmgroup_vm_map`.`vmgroup_id` = `autoscale_vmgroups`.`id`)))
- LEFT JOIN `user_vm_details` `custom_cpu` ON (((`custom_cpu`.`vm_id` =
`vm_instance`.`id`)
- AND (`custom_cpu`.`name` = 'CpuNumber'))))
- LEFT JOIN `user_vm_details` `custom_speed` ON
(((`custom_speed`.`vm_id` = `vm_instance`.`id`)
- AND (`custom_speed`.`name` = 'CpuSpeed'))))
- LEFT JOIN `user_vm_details` `custom_ram_size` ON
(((`custom_ram_size`.`vm_id` = `vm_instance`.`id`)
- AND (`custom_ram_size`.`name` = 'memory'))));
-
-- Quota inject tariff result into subsequent ones
CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.quota_tariff',
'position', 'bigint(20) NOT NULL DEFAULT 1 COMMENT "Position in the execution
sequence for tariffs of the same type"');
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 6caa95a4b63..cb859f2dde9 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -2356,7 +2356,7 @@ public class VolumeApiServiceImpl extends ManagerBase
implements VolumeApiServic
if (vm != null &&
vm.getType().equals(VirtualMachine.Type.User)) {
UserVmVO userVm =
_userVmDao.findById(volume.getInstanceId());
if (userVm != null &&
UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Shrink
volume cannot be done on a Shared FileSystem VM");
+ throw new InvalidParameterValueException("Shrink
volume cannot be done on a Shared FileSystem Instance");
}
}
}
@@ -2497,7 +2497,7 @@ public class VolumeApiServiceImpl extends ManagerBase
implements VolumeApiServic
UserVmVO vm = getAndCheckUserVmVO(vmId, volumeToAttach);
if (!allowAttachForSharedFS &&
UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
- throw new InvalidParameterValueException("Can't attach a volume to
a Shared FileSystem VM");
+ throw new InvalidParameterValueException("Can't attach a volume to
a Shared FileSystem Instance");
}
checkDeviceId(deviceId, volumeToAttach, vm);
@@ -2923,7 +2923,7 @@ public class VolumeApiServiceImpl extends ManagerBase
implements VolumeApiServic
UserVmVO vm = _userVmDao.findById(vmId);
if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
- throw new InvalidParameterValueException("Can't detach a volume
from a Shared FileSystem VM");
+ throw new InvalidParameterValueException("Can't detach a volume
from a Shared FileSystem Instance");
}
if (vm.getState() != State.Running && vm.getState() != State.Stopped
&& vm.getState() != State.Destroyed) {
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
index f58e5bf9aab..41e0b6f93ff 100755
--- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -1188,7 +1188,7 @@ public class TemplateManagerImpl extends ManagerBase
implements TemplateManager,
throw new InvalidParameterValueException("Unable to find a virtual
machine with id " + vmId);
}
if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
VMTemplateVO iso = _tmpltDao.findById(isoId);
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index cf81a78070f..9a56d1ff0b1 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -958,7 +958,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
throw new InvalidParameterValueException("unable to find a virtual
machine by id" + cmd.getId());
}
if (UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
_accountMgr.checkAccess(caller, null, true, userVm);
@@ -1005,7 +1005,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
throw new InvalidParameterValueException("unable to find a virtual
machine by id" + cmd.getId());
}
if (UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
VMTemplateVO template =
_templateDao.findByIdIncludingRemoved(userVm.getTemplateId());
@@ -1450,7 +1450,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
if ((network.getAclType() != ControlledEntity.ACLType.Account) ||
(network.getDomainId() != vmInstance.getDomainId()) ||
(network.getAccountId() != vmInstance.getAccountId())) {
- throw new InvalidParameterValueException("Shared network which
is not Account scoped and not belonging to the same account can not be added to
a Shared FileSystem VM");
+ throw new InvalidParameterValueException("Shared network which
is not Account scoped and not belonging to the same account can not be added to
a Shared FileSystem Instance");
}
}
@@ -2292,7 +2292,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
throw new InvalidParameterValueException("unable to find a virtual
machine with id " + vmId);
}
if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
// When trying to expunge, permission is denied when the caller is not
an admin and the AllowUserExpungeRecoverVm is false for the caller.
@@ -2831,7 +2831,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
}
UserVmVO userVm = _vmDao.findById(cmd.getId());
if (userVm != null &&
UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
String userData = cmd.getUserData();
@@ -3417,7 +3417,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
throw new InvalidParameterValueException("unable to find a virtual
machine with id " + vmId);
}
if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
if (Arrays.asList(State.Destroyed,
State.Expunging).contains(vm.getState()) && !expunge) {
@@ -5958,7 +5958,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
throw ex;
}
if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
if (vm.getRemoved() != null) {
@@ -7420,7 +7420,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
throw ex;
}
if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
final Account oldAccount =
_accountService.getActiveAccountById(vm.getAccountId());
@@ -7943,7 +7943,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
throw ex;
}
if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
_accountMgr.checkAccess(caller, null, true, vm);
diff --git
a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 408a27c64fc..cd67c720b49 100644
--- a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -509,7 +509,7 @@ public class VMSnapshotManagerImpl extends
MutualExclusiveIdsManagerBase impleme
throw new InvalidParameterValueException("Create vm to snapshot
failed due to vm: " + vmId + " is not found");
}
if (UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
VMSnapshotVO vmSnapshot = _vmSnapshotDao.findById(vmSnapshotId);
if (vmSnapshot == null) {
diff --git
a/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
b/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
index 77974d23491..0ec16f1e748 100644
---
a/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
+++
b/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
@@ -432,7 +432,7 @@ public class AffinityGroupServiceImpl extends ManagerBase
implements AffinityGro
throw new InvalidParameterValueException("Unable to find a virtual
machine with id " + vmId);
}
if (UserVmManager.SHAREDFSVM.equals(vmInstance.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not supported
on Shared FileSystem Instance");
}
// Check that the VM is stopped
diff --git
a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index b86b65bd465..4f99a22c9fc 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -299,7 +299,7 @@ public class BackupManagerImpl extends ManagerBase
implements BackupManager {
if (vm.getType().equals(VirtualMachine.Type.User)) {
UserVmVO userVm = userVmDao.findById(vmId);
if (userVm != null &&
UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem Instance");
}
}
@@ -434,7 +434,7 @@ public class BackupManagerImpl extends ManagerBase
implements BackupManager {
if (vm.getType().equals(VirtualMachine.Type.User)) {
UserVmVO userVm = userVmDao.findById(vmId);
if (userVm != null &&
UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem Instance");
}
}
validateForZone(vm.getDataCenterId());
@@ -507,7 +507,7 @@ public class BackupManagerImpl extends ManagerBase
implements BackupManager {
if (vm.getType().equals(VirtualMachine.Type.User)) {
UserVmVO userVm = userVmDao.findById(vmId);
if (userVm != null &&
UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem Instance");
}
}
@@ -787,7 +787,7 @@ public class BackupManagerImpl extends ManagerBase
implements BackupManager {
if (vm.getType().equals(VirtualMachine.Type.User)) {
UserVmVO userVm = userVmDao.findById(vmId);
if (userVm != null &&
UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem Instance");
}
}
accountManager.checkAccess(CallContext.current().getCallingAccount(),
null, true, vm);
diff --git
a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
index 2504cabf809..fc982668e73 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -2110,7 +2110,7 @@ public class UnmanagedVMsManagerImpl implements
UnmanagedVMsManager {
if (vmVO.getType().equals(VirtualMachine.Type.User)) {
UserVmVO userVm = userVmDao.findById(vmId);
if (UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
- throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem VM");
+ throw new InvalidParameterValueException("Operation not
supported on Shared FileSystem Instance");
}
}
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index f709c73e51a..eb1be420b2e 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -532,7 +532,7 @@
"label.complete": "Complete",
"label.compute": "Compute",
"label.compute.offerings": "Compute offerings",
-"label.compute.offering.for.vm": "Compute offering for VM",
+"label.compute.offering.for.sharedfs.instance": "Compute offering for
Instance",
"label.computeonly.offering": "Compute only disk offering",
"label.computeonly.offering.tooltip": "Option to specify root disk related
information in the compute offering or to directly link a disk offering to the
compute offering",
"label.conditions": "Conditions",
@@ -978,7 +978,7 @@
"label.filename": "File Name",
"label.fetched": "Fetched",
"label.files": "Alternate files to retrieve",
-"label.sharedfs": "Shared FileSystem",
+"label.shared.filesystems": "Shared FileSystems",
"label.filesystem": "Filesystem",
"label.filter": "Filter",
"label.filter.annotations.all": "All comments",
@@ -2691,7 +2691,7 @@
"message.action.remove.routing.policy": "Please confirm that you want to
remove Routing Policy from this Network",
"message.action.release.reserved.ip": "Please confirm that you want to release
this reserved IP.",
"message.action.reserve.ip": "Please confirm that you want to reserve this
IP.",
-"message.action.restart.sharedfs": "Please confirm that you want to restart
this Shared FileSystem. This will cause a downtime to the user.<br>Restart with
cleanup will re-initialize the Shared FileSystem VM without affecting the
installed file system.",
+"message.action.restart.sharedfs": "Please confirm that you want to restart
this Shared FileSystem. This will cause a downtime to the user.<br>Restart with
cleanup will re-initialize the Shared FileSystem Instance without affecting the
installed file system.",
"message.action.revert.snapshot": "Please confirm that you want to revert the
owning volume to this Snapshot.",
"message.action.router.health.checks": "Health checks result will be fetched
from router.",
"message.action.router.health.checks.disabled.warning": "Please enable router
health checks.",
diff --git a/ui/src/config/section/storage.js b/ui/src/config/section/storage.js
index d979e7395e0..5a50cb0b1dd 100644
--- a/ui/src/config/section/storage.js
+++ b/ui/src/config/section/storage.js
@@ -546,7 +546,7 @@ export default {
},
{
name: 'sharedfs',
- title: 'label.sharedfs',
+ title: 'label.shared.filesystems',
icon: 'file-text-outlined',
permission: ['listSharedFileSystems'],
resourceType: 'SharedFS',
diff --git a/ui/src/views/storage/CreateSharedFS.vue
b/ui/src/views/storage/CreateSharedFS.vue
index 6cfc8f7a6bd..4f5b1d9da68 100644
--- a/ui/src/views/storage/CreateSharedFS.vue
+++ b/ui/src/views/storage/CreateSharedFS.vue
@@ -151,7 +151,7 @@
</span>
<a-form-item ref="serviceofferingid" name="serviceofferingid">
<template #label>
- <tooltip-label :title="$t('label.compute.offering.for.vm')"
:tooltip="apiParams.serviceofferingid.description || 'Service Offering'"/>
+ <tooltip-label
:title="$t('label.compute.offering.for.sharedfs.instance')"
:tooltip="apiParams.serviceofferingid.description || 'Service Offering'"/>
</template>
<a-select
v-model:value="form.serviceofferingid"
