Skip to content

Commit cb530c1

Browse files
rohityadavcloudrohityadavcloud
committed
Merge remote-tracking branch 'origin/4.20'
2 parents 27d2de1 + 810c410 commit cb530c1

File tree

4 files changed

+49
-46
lines changed

4 files changed

+49
-46
lines changed

‎engine/schema/src/main/java/com/cloud/storage/VolumeVO.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -48,34 +48,34 @@ public class VolumeVO implements Volume {
4848
@TableGenerator(name = "volume_sq", table = "sequence", pkColumnName = "name", valueColumnName = "value", pkColumnValue = "volume_seq", allocationSize = 1)
4949
@GeneratedValue(strategy = GenerationType.TABLE)
5050
@Column(name = "id")
51-
long id;
51+
private long id;
5252

5353
@Column(name = "last_id")
5454
private long lastId;
5555

5656
@Column(name = "name")
57-
String name;
57+
private String name;
5858

5959
@Column(name = "pool_id")
60-
Long poolId;
60+
private Long poolId;
6161

6262
@Column(name = "last_pool_id")
63-
Long lastPoolId;
63+
private Long lastPoolId;
6464

6565
@Column(name = "account_id")
66-
long accountId;
66+
private long accountId;
6767

6868
@Column(name = "domain_id")
69-
long domainId;
69+
private long domainId;
7070

7171
@Column(name = "instance_id")
72-
Long instanceId = null;
72+
private Long instanceId = null;
7373

7474
@Column(name = "device_id")
75-
Long deviceId = null;
75+
private Long deviceId = null;
7676

7777
@Column(name = "size")
78-
Long size;
78+
private Long size;
7979

8080
@Column(name = "min_iops")
8181
private Long minIops;
@@ -84,50 +84,50 @@ public class VolumeVO implements Volume {
8484
private Long maxIops;
8585

8686
@Column(name = "folder")
87-
String folder;
87+
private String folder;
8888

8989
@Column(name = "path")
90-
String path;
90+
private String path;
9191

9292
@Column(name = "pod_id")
93-
Long podId;
93+
private Long podId;
9494

9595
@Column(name = "created")
96-
Date created;
96+
private Date created;
9797

9898
@Column(name = "attached")
9999
@Temporal(value = TemporalType.TIMESTAMP)
100-
Date attached;
100+
private Date attached;
101101

102102
@Column(name = "data_center_id")
103-
long dataCenterId;
103+
private long dataCenterId;
104104

105105
@Column(name = "host_ip")
106-
String hostip;
106+
private String hostIp;
107107

108108
@Column(name = "disk_offering_id")
109-
long diskOfferingId;
109+
private long diskOfferingId;
110110

111111
@Column(name = "template_id")
112-
Long templateId;
112+
private Long templateId;
113113

114114
@Column(name = "first_snapshot_backup_uuid")
115-
String firstSnapshotBackupUuid;
115+
private String firstSnapshotBackupUuid;
116116

117117
@Column(name = "volume_type")
118118
@Enumerated(EnumType.STRING)
119-
Type volumeType = Volume.Type.UNKNOWN;
119+
private Type volumeType = Volume.Type.UNKNOWN;
120120

121121
@Column(name = "pool_type")
122122
@Convert(converter = StoragePoolTypeConverter.class)
123-
StoragePoolType poolType;
123+
private StoragePoolType poolType;
124124

125125
@Column(name = GenericDao.REMOVED_COLUMN)
126-
Date removed;
126+
private Date removed;
127127

128128
@Column(name = "updated")
129129
@Temporal(value = TemporalType.TIMESTAMP)
130-
Date updated;
130+
private Date updated;
131131

132132
@Column(name = "update_count", updatable = true, nullable = false)
133133
protected long updatedCount; // This field should be updated everytime the
@@ -136,17 +136,17 @@ public class VolumeVO implements Volume {
136136
// dao code.
137137

138138
@Column(name = "recreatable")
139-
boolean recreatable;
139+
private boolean recreatable;
140140

141141
@Column(name = "state")
142142
@Enumerated(value = EnumType.STRING)
143143
private State state;
144144

145145
@Column(name = "chain_info", length = 65535)
146-
String chainInfo;
146+
private String chainInfo;
147147

148148
@Column(name = "uuid")
149-
String uuid;
149+
private String uuid;
150150

151151
@Column(name = "format")
152152
private Storage.ImageFormat format;
@@ -171,7 +171,7 @@ public class VolumeVO implements Volume {
171171

172172
@Transient
173173
// @Column(name="reservation")
174-
String reservationId;
174+
private String reservationId;
175175

176176
@Column(name = "hv_ss_reserve")
177177
private Integer hypervisorSnapshotReserve;
@@ -431,11 +431,11 @@ public void setPath(String path) {
431431
}
432432

433433
public String getHostIp() {
434-
return hostip;
434+
return hostIp;
435435
}
436436

437437
public void setHostIp(String hostip) {
438-
this.hostip = hostip;
438+
this.hostIp = hostip;
439439
}
440440

441441
public void setPodId(Long podId) {

‎server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3388,7 +3388,7 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) {
33883388
}
33893389
// In case of VMware, if ROOT volume is being cold-migrated, then ensure destination storage pool is in the same Datacenter as the VM.
33903390
if (vm != null && vm.getHypervisorType().equals(HypervisorType.VMware)) {
3391-
if (!liveMigrateVolume && vol.volumeType.equals(Volume.Type.ROOT)) {
3391+
if (!liveMigrateVolume && vol.getVolumeType().equals(Volume.Type.ROOT)) {
33923392
Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId();
33933393
HostVO host = _hostDao.findById(hostId);
33943394
if (host != null) {

‎ui/public/locales/pt_BR.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,8 @@
425425
"label.cputotalghz": "Total",
426426
"label.cpuused": "CPU utilizada",
427427
"label.cpuusedghz": "CPU utilizada",
428+
"label.create": "Criar",
429+
"label.create.instance": "Criar nova instância",
428430
"label.create.account": "Criar conta",
429431
"label.create.backup": "Iniciar backup",
430432
"label.create.network": "Criar nova rede",
@@ -1758,6 +1760,7 @@
17581760
"label.vmwaredcname": "Nome do datacenter VMware",
17591761
"label.vmwaredcvcenter": "Vcednter do datacenter VMware",
17601762
"label.vmwarenetworklabel": "Etiqueta de tr\u00e1fego VMware",
1763+
"label.vnf.appliance.add": "Adicionar VNF Appliance",
17611764
"label.vnmc": "VNMC",
17621765
"label.volgroup": "Grupo de volume",
17631766
"label.volume": "Disco",

‎ui/src/components/header/CreateMenu.vue‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
</a-col>
3333
<a-col>
3434
<h3 style="margin-bottom: 0px;">
35-
{{ menuItem.title }}
35+
{{ $t(menuItem.title) }}
3636
</h3>
37-
<small>{{ menuItem.subtitle }}</small>
37+
<small>{{ $t(menuItem.subtitle) }}</small>
3838
</a-col>
3939
</a-row>
4040
</router-link>
@@ -56,50 +56,50 @@ export default {
5656
const menuItems = [
5757
{
5858
api: 'deployVirtualMachine',
59-
title: this.$t('label.instance'),
60-
subtitle: this.$t('label.create.instance'),
59+
title: 'label.instance',
60+
subtitle: 'label.create.instance',
6161
icon: 'cloud-server-outlined',
6262
route: { path: '/action/deployVirtualMachine' }
6363
},
6464
{
6565
api: 'createKubernetesCluster',
66-
title: this.$t('label.kubernetes'),
67-
subtitle: this.$t('label.kubernetes.cluster.create'),
66+
title: 'label.kubernetes',
67+
subtitle: 'label.kubernetes.cluster.create',
6868
icon: ['fa-solid', 'fa-dharmachakra'],
6969
route: { path: '/kubernetes', query: { action: 'createKubernetesCluster' } }
7070
},
7171
{
7272
api: 'createVolume',
73-
title: this.$t('label.volume'),
74-
subtitle: this.$t('label.action.create.volume'),
73+
title: 'label.volume',
74+
subtitle: 'label.action.create.volume',
7575
icon: 'hdd-outlined',
7676
route: { path: '/volume', query: { action: 'createVolume' } }
7777
},
7878
{
7979
api: 'createNetwork',
80-
title: this.$t('label.network'),
81-
subtitle: this.$t('label.add.network'),
80+
title: 'label.network',
81+
subtitle: 'label.add.network',
8282
icon: 'apartment-outlined',
8383
route: { path: '/guestnetwork', query: { action: 'createNetwork' } }
8484
},
8585
{
8686
api: 'createVPC',
87-
title: this.$t('label.vpc'),
88-
subtitle: this.$t('label.add.vpc'),
87+
title: 'label.vpc',
88+
subtitle: 'label.add.vpc',
8989
icon: 'deployment-unit-outlined',
9090
route: { path: '/vpc', query: { action: 'createVPC' } }
9191
},
9292
{
9393
api: 'registerTemplate',
94-
title: this.$t('label.templatename'),
95-
subtitle: this.$t('label.action.register.template'),
94+
title: 'label.templatename',
95+
subtitle: 'label.action.register.template',
9696
icon: 'picture-outlined',
9797
route: { path: '/template', query: { action: 'registerTemplate' } }
9898
},
9999
{
100100
api: 'deployVnfAppliance',
101-
title: this.$t('label.vnf.appliance'),
102-
subtitle: this.$t('label.vnf.appliance.add'),
101+
title: 'label.vnf.appliance',
102+
subtitle: 'label.vnf.appliance.add',
103103
icon: 'gateway-outlined',
104104
route: { path: '/action/deployVnfAppliance' }
105105
}

0 commit comments

Comments
 (0)