diff --git a/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java b/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java index 3e6999fad36..ea57ef91237 100644 --- a/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java +++ b/engine/schema/src/main/java/com/cloud/storage/VolumeVO.java @@ -48,34 +48,34 @@ public class VolumeVO implements Volume { @TableGenerator(name = "volume_sq", table = "sequence", pkColumnName = "name", valueColumnName = "value", pkColumnValue = "volume_seq", allocationSize = 1) @GeneratedValue(strategy = GenerationType.TABLE) @Column(name = "id") - long id; + private long id; @Column(name = "last_id") private long lastId; @Column(name = "name") - String name; + private String name; @Column(name = "pool_id") - Long poolId; + private Long poolId; @Column(name = "last_pool_id") - Long lastPoolId; + private Long lastPoolId; @Column(name = "account_id") - long accountId; + private long accountId; @Column(name = "domain_id") - long domainId; + private long domainId; @Column(name = "instance_id") - Long instanceId = null; + private Long instanceId = null; @Column(name = "device_id") - Long deviceId = null; + private Long deviceId = null; @Column(name = "size") - Long size; + private Long size; @Column(name = "min_iops") private Long minIops; @@ -84,50 +84,50 @@ public class VolumeVO implements Volume { private Long maxIops; @Column(name = "folder") - String folder; + private String folder; @Column(name = "path") - String path; + private String path; @Column(name = "pod_id") - Long podId; + private Long podId; @Column(name = "created") - Date created; + private Date created; @Column(name = "attached") @Temporal(value = TemporalType.TIMESTAMP) - Date attached; + private Date attached; @Column(name = "data_center_id") - long dataCenterId; + private long dataCenterId; @Column(name = "host_ip") - String hostip; + private String hostIp; @Column(name = "disk_offering_id") - long diskOfferingId; + private long diskOfferingId; @Column(name = "template_id") - Long templateId; + private Long templateId; @Column(name = "first_snapshot_backup_uuid") - String firstSnapshotBackupUuid; + private String firstSnapshotBackupUuid; @Column(name = "volume_type") @Enumerated(EnumType.STRING) - Type volumeType = Volume.Type.UNKNOWN; + private Type volumeType = Volume.Type.UNKNOWN; @Column(name = "pool_type") @Convert(converter = StoragePoolTypeConverter.class) - StoragePoolType poolType; + private StoragePoolType poolType; @Column(name = GenericDao.REMOVED_COLUMN) - Date removed; + private Date removed; @Column(name = "updated") @Temporal(value = TemporalType.TIMESTAMP) - Date updated; + private Date updated; @Column(name = "update_count", updatable = true, nullable = false) protected long updatedCount; // This field should be updated everytime the @@ -136,17 +136,17 @@ public class VolumeVO implements Volume { // dao code. @Column(name = "recreatable") - boolean recreatable; + private boolean recreatable; @Column(name = "state") @Enumerated(value = EnumType.STRING) private State state; @Column(name = "chain_info", length = 65535) - String chainInfo; + private String chainInfo; @Column(name = "uuid") - String uuid; + private String uuid; @Column(name = "format") private Storage.ImageFormat format; @@ -171,7 +171,7 @@ public class VolumeVO implements Volume { @Transient // @Column(name="reservation") - String reservationId; + private String reservationId; @Column(name = "hv_ss_reserve") private Integer hypervisorSnapshotReserve; @@ -431,11 +431,11 @@ public class VolumeVO implements Volume { } public String getHostIp() { - return hostip; + return hostIp; } public void setHostIp(String hostip) { - this.hostip = hostip; + this.hostIp = hostip; } public void setPodId(Long podId) { diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index b12575a8a08..689d159905f 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -3388,7 +3388,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } // In case of VMware, if ROOT volume is being cold-migrated, then ensure destination storage pool is in the same Datacenter as the VM. if (vm != null && vm.getHypervisorType().equals(HypervisorType.VMware)) { - if (!liveMigrateVolume && vol.volumeType.equals(Volume.Type.ROOT)) { + if (!liveMigrateVolume && vol.getVolumeType().equals(Volume.Type.ROOT)) { Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId(); HostVO host = _hostDao.findById(hostId); if (host != null) { diff --git a/ui/public/locales/pt_BR.json b/ui/public/locales/pt_BR.json index c64163e8e30..511c8714daa 100644 --- a/ui/public/locales/pt_BR.json +++ b/ui/public/locales/pt_BR.json @@ -425,6 +425,8 @@ "label.cputotalghz": "Total", "label.cpuused": "CPU utilizada", "label.cpuusedghz": "CPU utilizada", +"label.create": "Criar", +"label.create.instance": "Criar nova instância", "label.create.account": "Criar conta", "label.create.backup": "Iniciar backup", "label.create.network": "Criar nova rede", @@ -1758,6 +1760,7 @@ "label.vmwaredcname": "Nome do datacenter VMware", "label.vmwaredcvcenter": "Vcednter do datacenter VMware", "label.vmwarenetworklabel": "Etiqueta de tr\u00e1fego VMware", +"label.vnf.appliance.add": "Adicionar VNF Appliance", "label.vnmc": "VNMC", "label.volgroup": "Grupo de volume", "label.volume": "Disco", diff --git a/ui/src/components/header/CreateMenu.vue b/ui/src/components/header/CreateMenu.vue index e80120d7a1c..8c39ec5b8a0 100644 --- a/ui/src/components/header/CreateMenu.vue +++ b/ui/src/components/header/CreateMenu.vue @@ -32,9 +32,9 @@

- {{ menuItem.title }} + {{ $t(menuItem.title) }}

- {{ menuItem.subtitle }} + {{ $t(menuItem.subtitle) }} @@ -56,50 +56,50 @@ export default { const menuItems = [ { api: 'deployVirtualMachine', - title: this.$t('label.instance'), - subtitle: this.$t('label.create.instance'), + title: 'label.instance', + subtitle: 'label.create.instance', icon: 'cloud-server-outlined', route: { path: '/action/deployVirtualMachine' } }, { api: 'createKubernetesCluster', - title: this.$t('label.kubernetes'), - subtitle: this.$t('label.kubernetes.cluster.create'), + title: 'label.kubernetes', + subtitle: 'label.kubernetes.cluster.create', icon: ['fa-solid', 'fa-dharmachakra'], route: { path: '/kubernetes', query: { action: 'createKubernetesCluster' } } }, { api: 'createVolume', - title: this.$t('label.volume'), - subtitle: this.$t('label.action.create.volume'), + title: 'label.volume', + subtitle: 'label.action.create.volume', icon: 'hdd-outlined', route: { path: '/volume', query: { action: 'createVolume' } } }, { api: 'createNetwork', - title: this.$t('label.network'), - subtitle: this.$t('label.add.network'), + title: 'label.network', + subtitle: 'label.add.network', icon: 'apartment-outlined', route: { path: '/guestnetwork', query: { action: 'createNetwork' } } }, { api: 'createVPC', - title: this.$t('label.vpc'), - subtitle: this.$t('label.add.vpc'), + title: 'label.vpc', + subtitle: 'label.add.vpc', icon: 'deployment-unit-outlined', route: { path: '/vpc', query: { action: 'createVPC' } } }, { api: 'registerTemplate', - title: this.$t('label.templatename'), - subtitle: this.$t('label.action.register.template'), + title: 'label.templatename', + subtitle: 'label.action.register.template', icon: 'picture-outlined', route: { path: '/template', query: { action: 'registerTemplate' } } }, { api: 'deployVnfAppliance', - title: this.$t('label.vnf.appliance'), - subtitle: this.$t('label.vnf.appliance.add'), + title: 'label.vnf.appliance', + subtitle: 'label.vnf.appliance.add', icon: 'gateway-outlined', route: { path: '/action/deployVnfAppliance' } }