Merge "VCPU replaced to vCPU"

blazar_dashboard/content/hosts/tables.py

@@ -63,7 +63,7 @@ class DeleteHost(tables.DeleteAction):
 class HostsTable(tables.DataTable):
     name = tables.Column("hypervisor_hostname", verbose_name=_("Host name"),
                          link="horizon:admin:hosts:detail")
-    vcpus = tables.Column("vcpus", verbose_name=_("VCPUs"))
+    vcpus = tables.Column("vcpus", verbose_name=_("vCPUs"))
     memory_mb = tables.Column("memory_mb", verbose_name=_("RAM"),
                               filters=(sizeformat.mb_float_format,))
     local_gb = tables.Column("local_gb", verbose_name=_("Local Storage"),

blazar_dashboard/content/hosts/templates/hosts/_detail_overview.html

@@ -22,7 +22,7 @@
     <h4>{% trans "CPU Specs" %}</h4>
     <hr class="header_rule">
     <dl class="dl-horizontal">
-      <dt>{% trans "VCPUs" %}</dt>
+      <dt>{% trans "vCPUs" %}</dt>
       <dd>{{ host.vcpus|default:_("None") }}</dd>
       {% for key, value in host.cpu_info_dict.items %}
         <dt>{{ key }}</dt>

blazar_dashboard/content/leases/forms.py

@@ -112,15 +112,15 @@ class CreateForm(forms.SelfHandlingForm):
             'data-source-instance': _('Instance Count')})
     )
     vcpus = forms.IntegerField(
-        label=_('Number of VCPUs'),
+        label=_('Number of vCPUs'),
         required=False,
-        help_text=_('Enter the number of VCPUs per instance.'),
+        help_text=_('Enter the number of vCPUs per instance.'),
         min_value=1,
         initial=1,
         widget=forms.NumberInput(attrs={
             'class': 'switched',
             'data-switch-on': 'source',
-            'data-source-instance': _('Number of VCPUs')})
+            'data-source-instance': _('Number of vCPUs')})
     )
     memory_mb = forms.IntegerField(
         label=_('RAM (MB)'),