fxies

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

ui/src/config/section/iam.js

@@ -84,7 +84,7 @@ export default {
       icon: 'team',
       permission: ['listAccounts'],
       columns: ['name', 'state', 'rolename', 'roletype', 'domain'],
-      details: ['name', 'id', 'rolename', 'roletype', 'domain', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal', 'receivedbytes', 'sentbytes'],
+      details: ['name', 'id', 'rolename', 'roletype', 'domain', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal', 'receivedbytes', 'sentbytes', 'vmlimit', 'iplimit', 'volumelimit', 'snapshotlimit', 'templatelimit', 'vpclimit', 'cpulimit', 'memorylimit', 'networklimit', 'primarystoragelimit', 'secondarystoragelimit'],
       related: [{
         name: 'accountuser',
         title: 'Users',
@@ -224,7 +224,7 @@ export default {
       permission: ['listDomains', 'listDomainChildren'],
       resourceType: 'Domain',
       columns: ['name', 'state', 'path', 'parentdomainname', 'level'],
-      details: ['name', 'id', 'path', 'parentdomainname', 'level', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal'],
+      details: ['name', 'id', 'path', 'parentdomainname', 'level', 'networkdomain', 'iptotal', 'vmtotal', 'volumetotal', 'vmlimit', 'iplimit', 'volumelimit', 'snapshotlimit', 'templatelimit', 'vpclimit', 'cpulimit', 'memorylimit', 'networklimit', 'primarystoragelimit', 'secondarystoragelimit'],
       related: [{
         name: 'account',
         title: 'Accounts',

ui/src/config/section/project.js

@@ -22,7 +22,7 @@ export default {
   permission: ['listProjects'],
   resourceType: 'Project',
   columns: ['name', 'state', 'displaytext', 'account', 'domain'],
-  details: ['name', 'id', 'displaytext', 'projectaccountname', 'vmtotal', 'cputotal', 'memorytotal', 'volumetotal', 'iptotal', 'vpctotal', 'templatetotal', 'primarystoragetotal', 'account', 'domain'],
+  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'],
   tabs: [
     {
       name: 'details',

ui/src/locales/en.json

@@ -130,7 +130,7 @@
 "conservemode": "Conserve mode",
 "counterid": "Counter",
 "cpuCap": "CPU Cap",
-"cpuLimit": "CPU limits",
+"cpulimit": "CPU limits",
 "cpuNumber": "# of CPU Cores",
 "cpuSpeed": "CPU (in MHz)",
 "cpuallocated": "CPU Allocated for VMs",
@@ -139,10 +139,10 @@
 "cpunumber": "CPU Cores",
 "cpusockets": "The Number of CPU Sockets",
 "cpuspeed": "CPU (in MHz)",
-"cputotal": "Total",
+"cputotal": "Total CPU",
 "cputotalghz": "Total",
 "cpuused": "CPU Utilized",
-"cpuusedghz": "Used",
+"cpuusedghz": "Used CPU",
 "createNfsCache": "Create NFS secondary staging store",
 "created": "Created",
 "credit": "Credit",
@@ -172,7 +172,7 @@
 "diskoffering": "Disk Offering",
 "diskofferingid": "Disk Offering",
 "diskSize": "Disk Size (in GB)",
-"diskiopstotal": "IOPS",
+"diskiopstotal": "Disk IOPS",
 "diskioread": "Disk Read (IO)",
 "diskiowrite": "Disk Write (IO)",
 "diskkbsread": "Disk Read (Bytes)",
@@ -298,7 +298,7 @@
 "ip6dns1": "IPv6 DNS1",
 "ip6dns2": "IPv6 DNS2",
 "ip6gateway": "IPv6 Gateway",
-"ipLimit": "Public IP Limits",
+"iplimit": "Public IP Limits",
 "ipaddress": "IP Address",
 "ipaddress1": "IP Address",
 "ipaddress2": "IP Address",
@@ -723,13 +723,13 @@
 "maxiops": "Max IOPS",
 "memallocated": "Mem Allocation",
 "memory": "Memory (in MB)",
-"memoryLimit": "Memory limits (MiB)",
+"memorylimit": "Memory limits (MiB)",
 "memoryallocated": "Memory Allocated",
 "memoryallocatedgb": "Allocated",
 "memorymaxdeviation": "Deviation",
-"memorytotal": "Allocated",
+"memorytotal": "Memory Allocated",
 "memorytotalgb": "Total",
-"memoryused": "Used",
+"memoryused": "Used Memory",
 "memoryusedgb": "Used",
 "memused": "Memory Usage",
 "message.edit.account": "Edit (\"-1\" indicates no limit to the amount of resources create)",
@@ -750,7 +750,7 @@
 "netmask": "Netmask",
 "network": "Network",
 "networkDomain": "Network Domain",
-"networkLimit": "Network limits",
+"networklimit": "Network limits",
 "networkOfferingId": "Network Offering",
 "networkRate": "Network Rate (Mb/s)",
 "networkcidr": "Network CIDR",
@@ -766,9 +766,9 @@
 "networkofferingidText": "Network Offering ID",
 "networkofferingname": "Network Offering",
 "networkrate": "Network Rate (Mb/s)",
-"networkread": "Read",
+"networkread": "Network Read",
 "networktype": "Network Type",
-"networkwrite": "Write",
+"networkwrite": "Network Write",
 "newDiskOffering": "New Disk Offering",
 "newdiskoffering": "New Offering",
 "newsize": "New Size (GB)",
@@ -820,7 +820,7 @@
 "portableipaddress": "Portable IPs",
 "portforwarding": "Port Forwarding",
 "powerstate": "Power State",
-"primaryStorageLimit": "Primary Storage limits (GiB)",
+"primarystoragelimit": "Primary Storage limits (GiB)",
 "primarystoragetotal": "Primary Storage",
 "privateinterface": "Private Interface",
 "privateip": "Private IP Address",
@@ -896,7 +896,7 @@
 "saturday": "Saturday",
 "schedule": "Schedule",
 "scope": "Scope",
-"secondaryStorageLimit": "Secondary Storage limits (GiB)",
+"secondarystoragelimit": "Secondary Storage limits (GiB)",
 "secondaryips": "Secondary IPs",
 "secretkey": "Secret Key",
 "securityGroups": "Security Groups",
@@ -929,7 +929,7 @@
 "smbDomain": "SMB Domain",
 "smbPassword": "SMB Password",
 "smbUsername": "SMB Username",
-"snapshotLimit": "Snapshot Limits",
+"snapshotlimit": "Snapshot Limits",
 "snapshotMemory": "Snapshot memory",
 "snmpCommunity": "SNMP Community",
 "snmpPort": "SNMP Port",
@@ -973,7 +973,7 @@
 "tcp": "TCP",
 "template": "Select a template",
 "templateFileUpload": "Local file",
-"templateLimit": "Template Limits",
+"templatelimit": "Template Limits",
 "templateNames": "Template",
 "templatebody": "Body",
 "templatedn": "Select Template",
@@ -1032,7 +1032,7 @@
 "vlanname": "VLAN",
 "vlanrange": "VLAN/VNI Range",
 "vm": "VM",
-"vmLimit": "Instance Limits",
+"vmlimit": "Instance Limits",
 "vmTotal": "Instances",
 "vmdisplayname": "VM display name",
 "vmipaddress": "VM IP Address",
@@ -1046,7 +1046,7 @@
 "volume": "Volume",
 "volumeChecksum": "MD5 checksum",
 "volumeFileUpload": "Local file",
-"volumeLimit": "Volume Limits",
+"volumelimit": "Volume Limits",
 "volumeTotal": "Volumes",
 "volumegroup": "Volume Group",
 "volumeids": "Volumes to be deleted",
@@ -1054,7 +1054,7 @@
 "volumes": "Volumes",
 "volumetotal": "Volume",
 "volume.volumeFileUpload.description": "Click or drag file to this area to upload",
-"vpcLimit": "VPC limits",
+"vpclimit": "VPC limits",
 "vpc": "VPC",
 "vpcid": "VPC",
 "vpcname": "VPC",

ui/src/views/dashboard/UsageDashboard.vue

@@ -34,9 +34,7 @@
                 :resource="project"
                 :loading="loading"
                 :bordered="false"
-                :stats="stats"
-                :params="tab.params"
-                :fields="tab.fields" />
+                :stats="stats" />
             </a-tab-pane>
           </a-tabs>
           <a-col