diff --git a/doc/source/admin/manage-flavors.rst b/doc/source/admin/manage-flavors.rst index 91255a765d..4fd224bc0d 100644 --- a/doc/source/admin/manage-flavors.rst +++ b/doc/source/admin/manage-flavors.rst @@ -11,7 +11,7 @@ As of Newton, there are no default flavors. The following table lists the default flavors for Mitaka and earlier. ============ ========= =============== ============= - Flavor VCPUs Disk (in GB) RAM (in MB) + Flavor vCPUs Disk (in GB) RAM (in MB) ============ ========= =============== ============= m1.tiny 1 1 512 m1.small 1 20 2048 @@ -40,7 +40,7 @@ Create flavors **ID** Unique ID (integer or UUID) for the new flavor. If specifying 'auto', a UUID will be automatically generated. - **VCPUs** Enter the number of virtual CPUs to + **vCPUs** Enter the number of virtual CPUs to use. **RAM (MB)** Enter the amount of RAM to use, in megabytes. diff --git a/doc/source/admin/manage-instances.rst b/doc/source/admin/manage-instances.rst index 9f727ecc02..a2564ca202 100644 --- a/doc/source/admin/manage-instances.rst +++ b/doc/source/admin/manage-instances.rst @@ -62,7 +62,7 @@ Track usage Use the :guilabel:`Overview` category to track usage of instances for each project. -You can track costs per month by showing meters like number of VCPUs, +You can track costs per month by showing meters like number of vCPUs, disks, RAM, and uptime of all your instances. #. Log in to the Dashboard and select the :guilabel:`admin` project from the diff --git a/doc/source/admin/set-quotas.rst b/doc/source/admin/set-quotas.rst index 7ed7451eda..f9b87d6964 100644 --- a/doc/source/admin/set-quotas.rst +++ b/doc/source/admin/set-quotas.rst @@ -71,7 +71,7 @@ The following table describes the Compute and Block Storage service quotas: | Snapshots | Volume snapshots allowed for | Block Storage | | | each project. | | +--------------------+------------------------------------+---------------+ -| VCPUs | Instance cores allowed for each | Compute | +| vCPUs | Instance cores allowed for each | Compute | | | project. | | +--------------------+------------------------------------+---------------+ | Volumes | Volumes allowed for each | Block Storage | diff --git a/doc/source/configuration/settings.rst b/doc/source/configuration/settings.rst index 8ba89b3453..7fd2a33b36 100644 --- a/doc/source/configuration/settings.rst +++ b/doc/source/configuration/settings.rst @@ -2154,12 +2154,12 @@ Default: When launching a new instance the default flavor is sorted by RAM usage in ascending order. -You can customize the sort order by: id, name, ram, disk and vcpus. +You can customize the sort order by: id, name, ram, disk and vCPUs. Additionally, you can insert any custom callback function. You can also provide a flag for reverse sort. See the description in local_settings.py.example for more information. -This example sorts flavors by vcpus in descending order: +This example sorts flavors by vCPUs in descending order: .. code-block:: python diff --git a/horizon/templates/horizon/common/_usage_summary.html b/horizon/templates/horizon/common/_usage_summary.html index ae3770dd8a..f2d2b529bc 100644 --- a/horizon/templates/horizon/common/_usage_summary.html +++ b/horizon/templates/horizon/common/_usage_summary.html @@ -13,7 +13,7 @@
{{ usage.summary.instances|default:'0' }}
{% trans "Active RAM:" %}
{{ usage.summary.memory_mb|mb_float_format|default:'0' }}
-
{% trans "This Period's VCPU-Hours:" %}
+
{% trans "This Period's vCPU-Hours:" %}
{{ usage.summary.vcpu_hours|floatformat:2|default:'0' }}
{% trans "This Period's GB-Hours:" %}
{{ usage.summary.disk_gb_hours|floatformat:2|default:'0' }}
diff --git a/openstack_dashboard/dashboards/admin/defaults/tables.py b/openstack_dashboard/dashboards/admin/defaults/tables.py index fafcb881e6..17907d802e 100644 --- a/openstack_dashboard/dashboards/admin/defaults/tables.py +++ b/openstack_dashboard/dashboards/admin/defaults/tables.py @@ -66,7 +66,7 @@ def get_compute_quota_name(quota): 'injected_file_content_bytes': _('Injected File Content (B)'), 'injected_file_path_bytes': _('Length of Injected File Path'), 'metadata_items': _('Metadata Items'), - 'cores': _('VCPUs'), + 'cores': _('vCPUs'), 'instances': _('Instances'), 'injected_files': _('Injected Files'), 'ram': _('RAM (MB)'), diff --git a/openstack_dashboard/dashboards/admin/defaults/workflows.py b/openstack_dashboard/dashboards/admin/defaults/workflows.py index d89e3ffe5d..1354eb44ed 100644 --- a/openstack_dashboard/dashboards/admin/defaults/workflows.py +++ b/openstack_dashboard/dashboards/admin/defaults/workflows.py @@ -30,7 +30,7 @@ LOG = logging.getLogger(__name__) class UpdateDefaultComputeQuotasAction(workflows.Action): instances = forms.IntegerField(min_value=-1, label=_("Instances")) - cores = forms.IntegerField(min_value=-1, label=_("VCPUs")) + cores = forms.IntegerField(min_value=-1, label=_("vCPUs")) ram = forms.IntegerField(min_value=-1, label=_("RAM (MB)")) metadata_items = forms.IntegerField(min_value=-1, label=_("Metadata Items")) diff --git a/openstack_dashboard/dashboards/admin/flavors/tables.py b/openstack_dashboard/dashboards/admin/flavors/tables.py index 698404e3dd..67b1e1178f 100644 --- a/openstack_dashboard/dashboards/admin/flavors/tables.py +++ b/openstack_dashboard/dashboards/admin/flavors/tables.py @@ -137,7 +137,7 @@ def get_extra_specs(flavor): class FlavorsTable(tables.DataTable): name = tables.WrappingColumn('name', verbose_name=_('Flavor Name')) - vcpus = tables.Column('vcpus', verbose_name=_('VCPUs')) + vcpus = tables.Column('vcpus', verbose_name=_('vCPUs')) ram = tables.Column(get_size, verbose_name=_('RAM'), attrs={'data-type': 'size'}) diff --git a/openstack_dashboard/dashboards/admin/flavors/workflows.py b/openstack_dashboard/dashboards/admin/flavors/workflows.py index 3244ad992e..3840c0e522 100644 --- a/openstack_dashboard/dashboards/admin/flavors/workflows.py +++ b/openstack_dashboard/dashboards/admin/flavors/workflows.py @@ -28,9 +28,9 @@ from openstack_dashboard import api class CreateFlavorInfoAction(workflows.Action): _flavor_id_regex = (r'^[a-zA-Z0-9. _-]+$') - _flavor_id_help_text = _("flavor id can only contain alphanumeric " + _flavor_id_help_text = _("Flavor id can only contain alphanumeric " "characters, underscores, periods, hyphens, " - "spaces. Use 'auto' to automatically generate id") + "spaces. Use 'auto' to automatically generate ID.") name = forms.CharField( label=_("Name"), max_length=255) @@ -40,7 +40,7 @@ class CreateFlavorInfoAction(workflows.Action): initial='auto', max_length=255, help_text=_flavor_id_help_text) - vcpus = forms.IntegerField(label=_("VCPUs"), + vcpus = forms.IntegerField(label=_("vCPUs"), min_value=1, max_value=2147483647) memory_mb = forms.IntegerField(label=_("RAM (MB)"), diff --git a/openstack_dashboard/dashboards/admin/hypervisors/tables.py b/openstack_dashboard/dashboards/admin/hypervisors/tables.py index 696418e573..839d9558a1 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/tables.py +++ b/openstack_dashboard/dashboards/admin/hypervisors/tables.py @@ -72,21 +72,21 @@ class AdminProvidersTable(tables.DataTable): name = tables.WrappingColumn("name", verbose_name=_("Resource Provider Name")) vcpus_used = tables.Column("vcpus_used", - verbose_name=_("VCPUs used")) + verbose_name=_("vCPUs used")) vcpus_reserved = tables.Column("vcpus_reserved", - verbose_name=_("VCPUs reserved")) + verbose_name=_("vCPUs reserved")) vcpus = tables.Column("vcpus", - verbose_name=_("VCPUs total")) + verbose_name=_("vCPUs total")) vcpus_ar = tables.Column("vcpus_ar", - verbose_name=_("VCPUs allocation ratio")) + verbose_name=_("vCPUs allocation ratio")) pcpus_used = tables.Column("pcpus_used", - verbose_name=_("PCPUs used")) + verbose_name=_("pCPUs used")) pcpus_reserved = tables.Column("pcpus_reserved", - verbose_name=_("PCPUs reserved")) + verbose_name=_("pCPUs reserved")) pcpus = tables.Column("pcpus", - verbose_name=_("PCPUs total")) + verbose_name=_("pCPUs total")) pcpus_ar = tables.Column("pcpus_ar", - verbose_name=_("PCPUs allocation ratio")) + verbose_name=_("pCPUs allocation ratio")) memory_used = tables.Column("memory_mb_used", verbose_name=_("RAM used"), attrs={'data-type': 'size'}, diff --git a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/index.html b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/index.html index 8b5728ce55..aa99c604ed 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/index.html +++ b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/index.html @@ -28,7 +28,7 @@

{{ provider.name }}

-
{% trans "VCPU Usage" %}
+
{% trans "vCPU Usage" %}
{% if provider.inventories.VCPU != None %}
{% blocktrans with used=provider.vcpus_used|intcomma available=provider.vcpus_capacity|intcomma %}Used {{ used }} of {{ available }} {% endblocktrans %} @@ -38,7 +38,7 @@
-
{% trans "PCPU Usage" %}
+
{% trans "pCPU Usage" %}
{% if provider.inventories.PCPU != None %}
{% blocktrans with used=provider.pcpus_used|intcomma available=provider.pcpus_capacity|intcomma %}Used {{ used }} of {{ available }} {% endblocktrans %} diff --git a/openstack_dashboard/dashboards/admin/instances/tests.py b/openstack_dashboard/dashboards/admin/instances/tests.py index c6cf65e5da..3a914c4f0d 100644 --- a/openstack_dashboard/dashboards/admin/instances/tests.py +++ b/openstack_dashboard/dashboards/admin/instances/tests.py @@ -197,7 +197,7 @@ class InstanceViewTest(test.BaseAdminViewTests): self.assertContains(res, "server_1", 2, 200) self.assertContains(res, "10.0.0.1", 1, 200) self.assertContains(res, "RAM512MB", 1, 200) - self.assertContains(res, "VCPUs1", 1, 200) + self.assertContains(res, "vCPUs1", 1, 200) self.assertContains(res, "Size0 GB", 1, 200) self.assertContains(res, "Active", 1, 200) self.assertContains(res, "Running", 1, 200) diff --git a/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv b/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv index 417a44277d..ad84ee5279 100644 --- a/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv +++ b/openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv @@ -1,6 +1,6 @@ {% load i18n %}{% trans "Usage Report For Period:" %},{{ usage.start|date:"Y-m-d" }},{{ usage.end|date:"Y-m-d" }} {% trans "Active Instances:" %},{{ usage.summary.instances }} -{% trans "Total VCPU Usage (Hours):" %},{{ usage.summary.vcpu_hours|floatformat:2 }} +{% trans "Total vCPU Usage (Hours):" %},{{ usage.summary.vcpu_hours|floatformat:2 }} {% trans "Total Active RAM (MB):" %},{{ usage.summary.memory_mb }} {% trans "Total Memory Usage (Hours):" %},{{ usage.summary.memory_mb_hours|floatformat:2 }} {% trans "Total Disk Size (GB):" %},{{ usage.summary.local_gb }} diff --git a/openstack_dashboard/dashboards/admin/overview/tests.py b/openstack_dashboard/dashboards/admin/overview/tests.py index f53624d069..2fc5385fb2 100644 --- a/openstack_dashboard/dashboards/admin/overview/tests.py +++ b/openstack_dashboard/dashboards/admin/overview/tests.py @@ -163,7 +163,7 @@ class UsageViewTests(test.BaseAdminViewTests): res = self.client.get(csv_url) self.assertTemplateUsed(res, 'admin/overview/usage.csv') self.assertIsInstance(res.context['usage'], usage.GlobalUsage) - hdr = '"Project Name","VCPUs","RAM (MB)","Disk (GB)","Usage (Hours)"' + hdr = '"Project Name","vCPUs","RAM (MB)","Disk (GB)","Usage (Hours)"' self.assertContains(res, '%s\r\n' % hdr) if nova_stu_enabled: diff --git a/openstack_dashboard/dashboards/admin/overview/views.py b/openstack_dashboard/dashboards/admin/overview/views.py index a943102085..424cbffe5a 100644 --- a/openstack_dashboard/dashboards/admin/overview/views.py +++ b/openstack_dashboard/dashboards/admin/overview/views.py @@ -30,7 +30,7 @@ from openstack_dashboard import usage class GlobalUsageCsvRenderer(csvbase.BaseCsvResponse): - columns = [_("Project Name"), _("VCPUs"), _("RAM (MB)"), + columns = [_("Project Name"), _("vCPUs"), _("RAM (MB)"), _("Disk (GB)"), _("Usage (Hours)")] def get_row_data(self): diff --git a/openstack_dashboard/dashboards/identity/projects/tests.py b/openstack_dashboard/dashboards/identity/projects/tests.py index bd33210ecc..e3dccae23c 100644 --- a/openstack_dashboard/dashboards/identity/projects/tests.py +++ b/openstack_dashboard/dashboards/identity/projects/tests.py @@ -1201,7 +1201,7 @@ class UsageViewTests(test.BaseAdminViewTests): self.assertTemplateUsed(res, 'project/overview/usage.csv') self.assertIsInstance(res.context['usage'], usage.ProjectUsage) - hdr = ('"Instance Name","VCPUs","RAM (MB)","Disk (GB)",' + hdr = ('"Instance Name","vCPUs","RAM (MB)","Disk (GB)",' '"Usage (Hours)","Age (Seconds)","State"') self.assertContains(res, '%s\r\n' % hdr) @@ -1224,7 +1224,7 @@ class UsageViewTests(test.BaseAdminViewTests): res = self.client.get(csv_url) self.assertIsInstance(res.context['usage'], usage.ProjectUsage) - hdr = ('"Instance Name","VCPUs","RAM (MB)","Disk (GB)",' + hdr = ('"Instance Name","vCPUs","RAM (MB)","Disk (GB)",' '"Usage (Hours)","Age (Seconds)","State"') self.assertContains(res, '%s\r\n' % hdr) usage_1_quoted = ('"\'=cmd|\' /C calc\'!A0","1","512","0","122.87",' diff --git a/openstack_dashboard/dashboards/identity/projects/workflows.py b/openstack_dashboard/dashboards/identity/projects/workflows.py index f15c275a20..aa1383decb 100644 --- a/openstack_dashboard/dashboards/identity/projects/workflows.py +++ b/openstack_dashboard/dashboards/identity/projects/workflows.py @@ -96,7 +96,7 @@ class CommonQuotaAction(workflows.Action): class ComputeQuotaAction(CommonQuotaAction): instances = forms.IntegerField(min_value=-1, label=_("Instances")) - cores = forms.IntegerField(min_value=-1, label=_("VCPUs")) + cores = forms.IntegerField(min_value=-1, label=_("vCPUs")) ram = forms.IntegerField(min_value=-1, label=_("RAM (MB)")) metadata_items = forms.IntegerField(min_value=-1, label=_("Metadata Items")) diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html index da71dae440..48e64646f9 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html @@ -69,8 +69,8 @@
{{ instance.full_flavor.id }}
{% trans "RAM" %}
{{ instance.full_flavor.ram|mb_float_format }}
-
{% trans "VCPUs" %}
-
{{ instance.full_flavor.vcpus }} {% trans "VCPU" %}
+
{% trans "vCPUs" %}
+
{{ instance.full_flavor.vcpus }} {% trans "vCPU" %}
{% trans "Disk" %}
{{ instance.full_flavor.disk }}{% trans "GB" %}
{% if instance.full_flavor.ephemeral %} diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html index 99a6e321b8..5822283e63 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html @@ -7,7 +7,7 @@ - + @@ -38,7 +38,7 @@ {{ endminifyspace }}
- {% trans "Number of VCPUs" %} + {% trans "Number of vCPUs" %} {% blocktrans trimmed with used=usages.totalCoresUsed|intcomma quota=usages.maxTotalCores|intcomma|quotainf %} {{ used }} of {{ quota }} Used diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html index b71600fd0f..2398dc1824 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html @@ -2,7 +2,7 @@ availableCores) { /*eslint-disable max-len */ - messages.vcpus = gettext('This flavor requires more VCPUs than your quota allows. Please select a smaller flavor or decrease the instance count.'); + messages.vcpus = gettext('This flavor requires more vCPUs than your quota allows. Please select a smaller flavor or decrease the instance count.'); /*eslint-enable max-len */ } diff --git a/openstack_dashboard/static/app/core/flavors/flavors.module.js b/openstack_dashboard/static/app/core/flavors/flavors.module.js index 2866b736cb..b3b20e4e81 100644 --- a/openstack_dashboard/static/app/core/flavors/flavors.module.js +++ b/openstack_dashboard/static/app/core/flavors/flavors.module.js @@ -88,7 +88,7 @@ singleton: true }) .append({ - label: gettext('VCPUs'), + label: gettext('vCPUs'), name: 'vcpus', singleton: true }) @@ -119,7 +119,7 @@ function flavorProperties() { return { name: gettext('Flavor Name'), - vcpus: gettext('VCPUs'), + vcpus: gettext('vCPUs'), ram: {label: gettext('RAM'), filters: ['mb']}, disk: {label: gettext('Root Disk'), filters: ['gb']}, 'OS-FLV-EXT-DATA:ephemeral': {label: gettext('Ephemeral Disk'), filters: ['gb']}, diff --git a/openstack_dashboard/test/selenium/ui/test_hypervisors.py b/openstack_dashboard/test/selenium/ui/test_hypervisors.py index f4f0f93eb6..c5293e951a 100644 --- a/openstack_dashboard/test/selenium/ui/test_hypervisors.py +++ b/openstack_dashboard/test/selenium/ui/test_hypervisors.py @@ -52,23 +52,23 @@ def test_vcpu_pcpu_data_display(live_server, driver, user, dashboard_data): driver.get(live_server.url + '/admin/hypervisors') assert (driver.find_element_by_xpath( - f"//*[normalize-space()='VCPU Usage']/" + f"//*[normalize-space()='vCPU Usage']/" f"ancestor::div[contains(@class,'d3_quota_bar')]" # noqa: E231 f"/div[contains(@class,'h6')]/" # noqa: E231 f"span[1]").text == str(p['vcpus_used'])) assert (driver.find_element_by_xpath( - f"//*[normalize-space()='VCPU Usage']/" + f"//*[normalize-space()='vCPU Usage']/" f"ancestor::div[contains(@class,'d3_quota_bar')]" # noqa: E231 f"/div[contains(@class,'h6')]/" # noqa: E231 f"span[2]").text == str(p['vcpus_capacity'])) assert (driver.find_element_by_xpath( - f"//*[normalize-space()='PCPU Usage']/" + f"//*[normalize-space()='pCPU Usage']/" f"ancestor::div[contains(@class,'d3_quota_bar')]" # noqa: E231 f"/div[contains(@class,'h6')]/" # noqa: E231 f"span[1]").text == str(p['pcpus_used'])) assert (driver.find_element_by_xpath( - f"//*[normalize-space()='PCPU Usage']/" + f"//*[normalize-space()='pCPU Usage']/" f"ancestor::div[contains(@class,'d3_quota_bar')]" # noqa: E231 f"/div[contains(@class,'h6')]/" # noqa: E231 f"span[2]").text == str(p['pcpus_capacity'])) @@ -84,14 +84,14 @@ def test_vcpu_pcpu_data_display(live_server, driver, user, dashboard_data): table_providers = dict(zip((x.text for x in table_header), (x.text for x in table_row_test_provider))) - want_to_check = {"VCPUs used": p['vcpus_used'], - "VCPUs reserved": p['vcpus_reserved'], - "VCPUs total": p['vcpus'], - "VCPUs allocation ratio": p['vcpus_ar'], - "PCPUs used": p['pcpus_used'], - "PCPUs reserved": p['pcpus_reserved'], - "PCPUs total": p['pcpus'], - "PCPUs allocation ratio": p['pcpus_ar']} + want_to_check = {"vCPUs used": p['vcpus_used'], + "vCPUs reserved": p['vcpus_reserved'], + "vCPUs total": p['vcpus'], + "vCPUs allocation ratio": p['vcpus_ar'], + "pCPUs used": p['pcpus_used'], + "pCPUs reserved": p['pcpus_reserved'], + "pCPUs total": p['pcpus'], + "pCPUs allocation ratio": p['pcpus_ar']} for key, value in want_to_check.items(): assert table_providers[key] == str(value) diff --git a/openstack_dashboard/usage/quotas.py b/openstack_dashboard/usage/quotas.py index d101f0337c..6891629fa7 100644 --- a/openstack_dashboard/usage/quotas.py +++ b/openstack_dashboard/usage/quotas.py @@ -93,7 +93,7 @@ QUOTA_FIELDS = NOVA_QUOTA_FIELDS | CINDER_QUOTA_FIELDS | NEUTRON_QUOTA_FIELDS QUOTA_NAMES = { # nova "metadata_items": _('Metadata Items'), - "cores": _('VCPUs'), + "cores": _('vCPUs'), "instances": _('Instances'), "injected_files": _('Injected Files'), "injected_file_content_bytes": _('Injected File Content (B)'), diff --git a/openstack_dashboard/usage/tables.py b/openstack_dashboard/usage/tables.py index 536a40fd75..517fda5098 100644 --- a/openstack_dashboard/usage/tables.py +++ b/openstack_dashboard/usage/tables.py @@ -29,7 +29,7 @@ class CSVSummary(tables.LinkAction): class BaseUsageTable(tables.DataTable): - vcpus = tables.Column('vcpus', verbose_name=_("VCPUs")) + vcpus = tables.Column('vcpus', verbose_name=_("vCPUs")) disk = tables.Column('local_gb', verbose_name=_("Disk"), filters=(sizeformat.diskgbformat,), attrs={"data-type": "size"}) @@ -41,9 +41,9 @@ class BaseUsageTable(tables.DataTable): class GlobalUsageTable(BaseUsageTable): project = tables.Column('project_name', verbose_name=_("Project Name")) - vcpu_hours = tables.Column('vcpu_hours', verbose_name=_("VCPU Hours"), - help_text=_("Total VCPU usage (Number of " - "VCPU in instance * Hours Used) " + vcpu_hours = tables.Column('vcpu_hours', verbose_name=_("vCPU Hours"), + help_text=_("Total vCPU usage (Number of " + "vCPU in instance * Hours Used) " "for the project"), filters=(lambda v: floatformat(v, 2),)) disk_hours = tables.Column('disk_gb_hours', diff --git a/openstack_dashboard/usage/views.py b/openstack_dashboard/usage/views.py index e8201ae450..80a9eab0c2 100644 --- a/openstack_dashboard/usage/views.py +++ b/openstack_dashboard/usage/views.py @@ -114,7 +114,7 @@ CHART_DEFS = [ 'title': _("Compute"), 'charts': [ ChartDef("instances", _("Instances"), None, None), - ChartDef("cores", _("VCPUs"), None, None), + ChartDef("cores", _("vCPUs"), None, None), ChartDef("ram", _("RAM"), None, (sizeformat.mb_float_format,)), ], },
{% trans "Name" %}
{% trans "VCPUs" %}
{% trans "vCPUs" %}
{% trans "Root Disk" %} {% trans "GB" %}
{% trans "Ephemeral Disk" %} {% trans "GB" %}
{% trans "Total Disk" %} {% trans "GB" %}