Skip to content

Commit fc4cd2d

Browse files
yadvryadvr
committed
fxies
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 2a32d56 commit fc4cd2d

4 files changed

Lines changed: 22 additions & 24 deletions

File tree

‎ui/src/config/section/iam.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default {
8484
icon: 'team',
8585
permission: ['listAccounts'],
8686
columns: ['name', 'state', 'rolename', 'roletype', 'domain'],
87-
details: ['name', 'id', 'rolename', 'roletype', 'domain', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal', 'receivedbytes', 'sentbytes'],
87+
details: ['name', 'id', 'rolename', 'roletype', 'domain', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal', 'receivedbytes', 'sentbytes', 'vmlimit', 'iplimit', 'volumelimit', 'snapshotlimit', 'templatelimit', 'vpclimit', 'cpulimit', 'memorylimit', 'networklimit', 'primarystoragelimit', 'secondarystoragelimit'],
8888
related: [{
8989
name: 'accountuser',
9090
title: 'Users',
@@ -224,7 +224,7 @@ export default {
224224
permission: ['listDomains', 'listDomainChildren'],
225225
resourceType: 'Domain',
226226
columns: ['name', 'state', 'path', 'parentdomainname', 'level'],
227-
details: ['name', 'id', 'path', 'parentdomainname', 'level', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal'],
227+
details: ['name', 'id', 'path', 'parentdomainname', 'level', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal', 'vmlimit', 'iplimit', 'volumelimit', 'snapshotlimit', 'templatelimit', 'vpclimit', 'cpulimit', 'memorylimit', 'networklimit', 'primarystoragelimit', 'secondarystoragelimit'],
228228
related: [{
229229
name: 'account',
230230
title: 'Accounts',

‎ui/src/config/section/project.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default {
2222
permission: ['listProjects'],
2323
resourceType: 'Project',
2424
columns: ['name', 'state', 'displaytext', 'account', 'domain'],
25-
details: ['name', 'id', 'displaytext', 'projectaccountname', 'vmtotal', 'cputotal', 'memorytotal', 'volumetotal', 'iptotal', 'vpctotal', 'templatetotal', 'primarystoragetotal', 'account', 'domain'],
25+
details: ['name', 'id', 'displaytext', 'projectaccountname', 'vmtotal', 'cputotal', 'memorytotal', 'volumetotal', 'iptotal', 'vpctotal', 'templatetotal', 'primarystoragetotal', 'vmlimit', 'iplimit', 'volumelimit', 'snapshotlimit', 'templatelimit', 'vpclimit', 'cpulimit', 'memorylimit', 'networklimit', 'primarystoragelimit', 'secondarystoragelimit', 'account', 'domain'],
2626
tabs: [
2727
{
2828
name: 'details',

‎ui/src/locales/en.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
"conservemode": "Conserve mode",
131131
"counterid": "Counter",
132132
"cpuCap": "CPU Cap",
133-
"cpuLimit": "CPU limits",
133+
"cpulimit": "CPU limits",
134134
"cpuNumber": "# of CPU Cores",
135135
"cpuSpeed": "CPU (in MHz)",
136136
"cpuallocated": "CPU Allocated for VMs",
@@ -139,10 +139,10 @@
139139
"cpunumber": "CPU Cores",
140140
"cpusockets": "The Number of CPU Sockets",
141141
"cpuspeed": "CPU (in MHz)",
142-
"cputotal": "Total",
142+
"cputotal": "Total CPU",
143143
"cputotalghz": "Total",
144144
"cpuused": "CPU Utilized",
145-
"cpuusedghz": "Used",
145+
"cpuusedghz": "Used CPU",
146146
"createNfsCache": "Create NFS secondary staging store",
147147
"created": "Created",
148148
"credit": "Credit",
@@ -172,7 +172,7 @@
172172
"diskoffering": "Disk Offering",
173173
"diskofferingid": "Disk Offering",
174174
"diskSize": "Disk Size (in GB)",
175-
"diskiopstotal": "IOPS",
175+
"diskiopstotal": "Disk IOPS",
176176
"diskioread": "Disk Read (IO)",
177177
"diskiowrite": "Disk Write (IO)",
178178
"diskkbsread": "Disk Read (Bytes)",
@@ -298,7 +298,7 @@
298298
"ip6dns1": "IPv6 DNS1",
299299
"ip6dns2": "IPv6 DNS2",
300300
"ip6gateway": "IPv6 Gateway",
301-
"ipLimit": "Public IP Limits",
301+
"iplimit": "Public IP Limits",
302302
"ipaddress": "IP Address",
303303
"ipaddress1": "IP Address",
304304
"ipaddress2": "IP Address",
@@ -723,13 +723,13 @@
723723
"maxiops": "Max IOPS",
724724
"memallocated": "Mem Allocation",
725725
"memory": "Memory (in MB)",
726-
"memoryLimit": "Memory limits (MiB)",
726+
"memorylimit": "Memory limits (MiB)",
727727
"memoryallocated": "Memory Allocated",
728728
"memoryallocatedgb": "Allocated",
729729
"memorymaxdeviation": "Deviation",
730-
"memorytotal": "Allocated",
730+
"memorytotal": "Memory Allocated",
731731
"memorytotalgb": "Total",
732-
"memoryused": "Used",
732+
"memoryused": "Used Memory",
733733
"memoryusedgb": "Used",
734734
"memused": "Memory Usage",
735735
"message.edit.account": "Edit (\"-1\" indicates no limit to the amount of resources create)",
@@ -750,7 +750,7 @@
750750
"netmask": "Netmask",
751751
"network": "Network",
752752
"networkDomain": "Network Domain",
753-
"networkLimit": "Network limits",
753+
"networklimit": "Network limits",
754754
"networkOfferingId": "Network Offering",
755755
"networkRate": "Network Rate (Mb/s)",
756756
"networkcidr": "Network CIDR",
@@ -766,9 +766,9 @@
766766
"networkofferingidText": "Network Offering ID",
767767
"networkofferingname": "Network Offering",
768768
"networkrate": "Network Rate (Mb/s)",
769-
"networkread": "Read",
769+
"networkread": "Network Read",
770770
"networktype": "Network Type",
771-
"networkwrite": "Write",
771+
"networkwrite": "Network Write",
772772
"newDiskOffering": "New Disk Offering",
773773
"newdiskoffering": "New Offering",
774774
"newsize": "New Size (GB)",
@@ -820,7 +820,7 @@
820820
"portableipaddress": "Portable IPs",
821821
"portforwarding": "Port Forwarding",
822822
"powerstate": "Power State",
823-
"primaryStorageLimit": "Primary Storage limits (GiB)",
823+
"primarystoragelimit": "Primary Storage limits (GiB)",
824824
"primarystoragetotal": "Primary Storage",
825825
"privateinterface": "Private Interface",
826826
"privateip": "Private IP Address",
@@ -896,7 +896,7 @@
896896
"saturday": "Saturday",
897897
"schedule": "Schedule",
898898
"scope": "Scope",
899-
"secondaryStorageLimit": "Secondary Storage limits (GiB)",
899+
"secondarystoragelimit": "Secondary Storage limits (GiB)",
900900
"secondaryips": "Secondary IPs",
901901
"secretkey": "Secret Key",
902902
"securityGroups": "Security Groups",
@@ -929,7 +929,7 @@
929929
"smbDomain": "SMB Domain",
930930
"smbPassword": "SMB Password",
931931
"smbUsername": "SMB Username",
932-
"snapshotLimit": "Snapshot Limits",
932+
"snapshotlimit": "Snapshot Limits",
933933
"snapshotMemory": "Snapshot memory",
934934
"snmpCommunity": "SNMP Community",
935935
"snmpPort": "SNMP Port",
@@ -973,7 +973,7 @@
973973
"tcp": "TCP",
974974
"template": "Select a template",
975975
"templateFileUpload": "Local file",
976-
"templateLimit": "Template Limits",
976+
"templatelimit": "Template Limits",
977977
"templateNames": "Template",
978978
"templatebody": "Body",
979979
"templatedn": "Select Template",
@@ -1032,7 +1032,7 @@
10321032
"vlanname": "VLAN",
10331033
"vlanrange": "VLAN/VNI Range",
10341034
"vm": "VM",
1035-
"vmLimit": "Instance Limits",
1035+
"vmlimit": "Instance Limits",
10361036
"vmTotal": "Instances",
10371037
"vmdisplayname": "VM display name",
10381038
"vmipaddress": "VM IP Address",
@@ -1046,15 +1046,15 @@
10461046
"volume": "Volume",
10471047
"volumeChecksum": "MD5 checksum",
10481048
"volumeFileUpload": "Local file",
1049-
"volumeLimit": "Volume Limits",
1049+
"volumelimit": "Volume Limits",
10501050
"volumeTotal": "Volumes",
10511051
"volumegroup": "Volume Group",
10521052
"volumeids": "Volumes to be deleted",
10531053
"volumename": "Volume Name",
10541054
"volumes": "Volumes",
10551055
"volumetotal": "Volume",
10561056
"volume.volumeFileUpload.description": "Click or drag file to this area to upload",
1057-
"vpcLimit": "VPC limits",
1057+
"vpclimit": "VPC limits",
10581058
"vpc": "VPC",
10591059
"vpcid": "VPC",
10601060
"vpcname": "VPC",

‎ui/src/views/dashboard/UsageDashboard.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
:resource="project"
3535
:loading="loading"
3636
:bordered="false"
37-
:stats="stats"
38-
:params="tab.params"
39-
:fields="tab.fields" />
37+
:stats="stats" />
4038
</a-tab-pane>
4139
</a-tabs>
4240
<a-col

0 commit comments

Comments
 (0)