-
Compute Hosts
-
+
Worker Hosts
+
Provider Networks
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/forms.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/forms.py
index f7191be1..2b516a33 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/forms.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/forms.py
@@ -145,7 +145,7 @@ class UpdateCpuFunctions(forms.SelfHandlingForm):
'platform_processor3'].help_text = \
"Processor 3 has %s physical cores." % avail_socket_cores
- if 'compute' not in self.host.subfunctions:
+ if 'worker' not in self.host.subfunctions:
self.fields['vswitch'].widget = forms.widgets.HiddenInput()
self.fields[
'num_cores_on_processor0'].widget = forms.widgets.HiddenInput()
@@ -214,7 +214,7 @@ class UpdateCpuFunctions(forms.SelfHandlingForm):
for s in range(0, 4):
processor = 'num_shared_on_processor{0}'.format(s)
- if ('compute' not in self.host.subfunctions or
+ if ('worker' not in self.host.subfunctions or
kwargs['initial'][processor] == 99): # No Processor
self.fields[processor].widget = forms.widgets.HiddenInput()
else:
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/utils.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/utils.py
index 510e8e73..cf9312bd 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/utils.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/utils.py
@@ -10,24 +10,24 @@ from django.utils.translation import ugettext_lazy as _
PLATFORM_CPU_TYPE = "Platform"
VSWITCH_CPU_TYPE = "Vswitch"
SHARED_CPU_TYPE = "Shared"
-VMS_CPU_TYPE = "VMs"
+APPLICATIONS_CPU_TYPE = "Applications"
NONE_CPU_TYPE = "None"
CPU_TYPE_LIST = [PLATFORM_CPU_TYPE, VSWITCH_CPU_TYPE,
- SHARED_CPU_TYPE, VMS_CPU_TYPE,
+ SHARED_CPU_TYPE, APPLICATIONS_CPU_TYPE,
NONE_CPU_TYPE]
PLATFORM_CPU_TYPE_FORMAT = _("Platform")
VSWITCH_CPU_TYPE_FORMAT = _("vSwitch")
SHARED_CPU_TYPE_FORMAT = _("Shared")
-VMS_CPU_TYPE_FORMAT = _("VMs")
+APPLICATIONS_CPU_TYPE_FORMAT = _("Applications")
NONE_CPU_TYPE_FORMAT = _("None")
CPU_TYPE_FORMATS = {PLATFORM_CPU_TYPE: PLATFORM_CPU_TYPE_FORMAT,
VSWITCH_CPU_TYPE: VSWITCH_CPU_TYPE_FORMAT,
SHARED_CPU_TYPE: SHARED_CPU_TYPE_FORMAT,
- VMS_CPU_TYPE: VMS_CPU_TYPE_FORMAT,
+ APPLICATIONS_CPU_TYPE: APPLICATIONS_CPU_TYPE_FORMAT,
NONE_CPU_TYPE: NONE_CPU_TYPE_FORMAT}
@@ -81,7 +81,7 @@ class CpuProfile(object):
cur_processor.vswitch += 1
elif cpu.allocated_function == SHARED_CPU_TYPE:
cur_processor.shared += 1
- elif cpu.allocated_function == VMS_CPU_TYPE:
+ elif cpu.allocated_function == APPLICATIONS_CPU_TYPE:
cur_processor.vms += 1
self.cores_per_cpu = len(cores)
@@ -126,9 +126,9 @@ class HostCpuProfile(CpuProfile):
result = True
if platform_cores == 0:
result = False
- elif 'compute' in self.personality and vswitch_cores == 0:
+ elif 'worker' in self.personality and vswitch_cores == 0:
result = False
- elif 'compute' in self.personality and vm_cores == 0:
+ elif 'worker' in self.personality and vm_cores == 0:
result = False
return result
@@ -199,7 +199,7 @@ def restructure_host_cpu_data(host):
else:
if (f == PLATFORM_CPU_TYPE or
(hasattr(host, 'subfunctions') and
- 'compute' in host.subfunctions)):
+ 'worker' in host.subfunctions)):
if f != NONE_CPU_TYPE:
host.core_assignment.append(cpufunction)
for s in range(0, len(host.nodes)):
@@ -220,7 +220,7 @@ def check_core_functions(personality, icpus):
vswitch_cores += 1
elif allocated_function == SHARED_CPU_TYPE:
shared_vcpu_cores += 1
- elif allocated_function == VMS_CPU_TYPE:
+ elif allocated_function == APPLICATIONS_CPU_TYPE:
vm_cores += 1
# No limiations for shared_vcpu cores
@@ -228,10 +228,10 @@ def check_core_functions(personality, icpus):
if platform_cores == 0:
error_string = "There must be at least one" \
" core for %s." % PLATFORM_CPU_TYPE_FORMAT
- elif 'compute' in personality and vswitch_cores == 0:
+ elif 'worker' in personality and vswitch_cores == 0:
error_string = "There must be at least one" \
" core for %s." % VSWITCH_CPU_TYPE_FORMAT
- elif 'compute' in personality and vm_cores == 0:
+ elif 'worker' in personality and vm_cores == 0:
error_string = "There must be at least one" \
- " core for %s." % VMS_CPU_TYPE_FORMAT
+ " core for %s." % APPLICATIONS_CPU_TYPE_FORMAT
return error_string
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/devices/tables.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/devices/tables.py
index 1792422d..411b0ded 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/devices/tables.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/devices/tables.py
@@ -32,7 +32,7 @@ class EditDevice(tables.LinkAction):
def allowed(self, request, datum):
host = self.table.kwargs['host']
return (host._administrative == 'locked' and
- stx_api.sysinv.SUBFUNCTIONS_COMPUTE in host.subfunctions)
+ stx_api.sysinv.SUBFUNCTIONS_WORKER in host.subfunctions)
def get_viewdevice_link_url(device):
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/tables.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/tables.py
index fe167350..1983abde 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/tables.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/tables.py
@@ -91,7 +91,7 @@ class CreateInterface(tables.LinkAction):
if i.ifclass:
count = count + 1
- if host.subfunctions and 'compute' not in host.subfunctions and \
+ if host.subfunctions and 'worker' not in host.subfunctions and \
count >= len(INTERFACE_CLASS_TYPES):
return False
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/forms.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/forms.py
index 063cda64..8b584b33 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/forms.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/forms.py
@@ -36,11 +36,11 @@ class UpdateMemory(forms.SelfHandlingForm):
required=False)
vm_hugepages_nr_2M = forms.CharField(
- label=_("# of VM 2M Hugepages Node 0"),
+ label=_("# of Application 2M Hugepages Node 0"),
required=False)
vm_hugepages_nr_1G = forms.CharField(
- label=_("# of VM 1G Hugepages Node 0"),
+ label=_("# of Application 1G Hugepages Node 0"),
required=False)
platform_memory_two = forms.CharField(
@@ -48,11 +48,11 @@ class UpdateMemory(forms.SelfHandlingForm):
required=False)
vm_hugepages_nr_2M_two = forms.CharField(
- label=_("# of VM 2M Hugepages Node 1"),
+ label=_("# of Application 2M Hugepages Node 1"),
required=False)
vm_hugepages_nr_1G_two = forms.CharField(
- label=_("# of VM 1G Hugepages Node 1"),
+ label=_("# of Application 1G Hugepages Node 1"),
required=False)
platform_memory_three = forms.CharField(
@@ -60,11 +60,11 @@ class UpdateMemory(forms.SelfHandlingForm):
required=False)
vm_hugepages_nr_2M_three = forms.CharField(
- label=_("# of VM 2M Hugepages Node 2"),
+ label=_("# of Application 2M Hugepages Node 2"),
required=False)
vm_hugepages_nr_1G_three = forms.CharField(
- label=_("# of VM 1G Hugepages Node 2"),
+ label=_("# of Application 1G Hugepages Node 2"),
required=False)
platform_memory_four = forms.CharField(
@@ -72,11 +72,11 @@ class UpdateMemory(forms.SelfHandlingForm):
required=False)
vm_hugepages_nr_2M_four = forms.CharField(
- label=_("# of VM 2M Hugepages Node 3"),
+ label=_("# of Application 2M Hugepages Node 3"),
required=False)
vm_hugepages_nr_1G_four = forms.CharField(
- label=_("# of VM 1G Hugepages Node 3"),
+ label=_("# of Application 1G Hugepages Node 3"),
required=False)
failure_url = 'horizon:admin:inventory:detail'
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/tables.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/tables.py
index e66b1bde..8bdc396c 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/tables.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/tables.py
@@ -31,7 +31,7 @@ class UpdateMemory(tables.LinkAction):
host = self.table.kwargs['host']
return (host._administrative == 'locked' and
host.subfunctions and
- 'compute' in host.subfunctions)
+ 'worker' in host.subfunctions)
class CreateMemoryProfile(tables.LinkAction):
@@ -77,7 +77,7 @@ class MemorysTable(tables.DataTable):
verbose_name=_('Memory'))
vm_huge = tables.Column(get_vm_hugepages,
- verbose_name=_('VM Pages'))
+ verbose_name=_('Application Pages'))
def get_object_id(self, datum):
return str(datum.uuid)
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/forms.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/forms.py
index f0e0af91..7d9bf9cb 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/forms.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/forms.py
@@ -408,7 +408,7 @@ class AddLocalVolumeGroup(forms.SelfHandlingForm):
stx_api.sysinv.PERSONALITY_CONTROLLER):
compatible_lvgs += [stx_api.sysinv.LVG_CINDER_VOLUMES]
- if stx_api.sysinv.SUBFUNCTIONS_COMPUTE in subfunctions:
+ if stx_api.sysinv.SUBFUNCTIONS_WORKER in subfunctions:
compatible_lvgs += [stx_api.sysinv.LVG_NOVA_LOCAL]
allowed_lvgs = set(compatible_lvgs) - set(current_lvgs)
@@ -542,7 +542,7 @@ class AddPhysicalVolume(forms.SelfHandlingForm):
compatible_lvgs += [stx_api.sysinv.LVG_CGTS_VG,
stx_api.sysinv.LVG_CINDER_VOLUMES]
- if stx_api.sysinv.SUBFUNCTIONS_COMPUTE in subfunctions:
+ if stx_api.sysinv.SUBFUNCTIONS_WORKER in subfunctions:
compatible_lvgs += [stx_api.sysinv.LVG_NOVA_LOCAL]
avail_disk_list = stx_api.sysinv.host_disk_list(self.request,
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/tables.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/tables.py
index 85815da8..23bcb5dd 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/tables.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/tables.py
@@ -378,8 +378,8 @@ class AddLocalVolumeGroup(tables.LinkAction):
self.classes = classes
if not host._administrative == 'locked':
- if 'compute' in host._subfunctions and \
- host.compute_config_required is False:
+ if 'worker' in host._subfunctions and \
+ host.worker_config_required is False:
if "disabled" not in self.classes:
self.classes = [c for c in self.classes] + ['disabled']
self.verbose_name = string_concat(self.verbose_name, ' ',
@@ -396,7 +396,7 @@ class AddLocalVolumeGroup(tables.LinkAction):
if host._personality == 'controller':
compatible_lvgs += [sysinv.LVG_CINDER_VOLUMES]
- if 'compute' in host._subfunctions:
+ if 'worker' in host._subfunctions:
compatible_lvgs += [sysinv.LVG_NOVA_LOCAL]
allowed_lvgs = set(compatible_lvgs) - set(current_lvgs)
@@ -432,8 +432,8 @@ class RemoveLocalVolumeGroup(tables.DeleteAction):
if lvg.lvm_vg_name == sysinv.LVG_NOVA_LOCAL:
return ((host._administrative == 'locked') or
- (('compute' in host._subfunctions) and
- (host.compute_config_required is True)))
+ (('worker' in host._subfunctions) and
+ (host.worker_config_required is True)))
elif lvg.lvm_vg_name == sysinv.LVG_CINDER_VOLUMES:
return (sysinv.CINDER_BACKEND_LVM not in cinder_backend and
sysinv.LVG_ADD in lvg.vg_state)
@@ -512,11 +512,11 @@ class AddPhysicalVolume(tables.LinkAction):
if host._personality == sysinv.PERSONALITY_CONTROLLER:
return True
- # nova-local: Allow adding to any locked host with a compute
+ # nova-local: Allow adding to any locked host with a worker
# subfunction. On an AIO, the previous check superceeds this.
if host._administrative != 'locked':
- if 'compute' in host._subfunctions and \
- host.compute_config_required is False:
+ if 'worker' in host._subfunctions and \
+ host.worker_config_required is False:
if "disabled" not in self.classes:
self.classes = [c for c in self.classes] + ['disabled']
self.verbose_name = string_concat(self.verbose_name, ' ',
@@ -555,8 +555,8 @@ class RemovePhysicalVolume(tables.DeleteAction):
if pv.lvm_vg_name == sysinv.LVG_NOVA_LOCAL:
return ((host._administrative == 'locked') or
- (('compute' in host._subfunctions) and
- (host.compute_config_required is True)))
+ (('worker' in host._subfunctions) and
+ (host.worker_config_required is True)))
elif pv.lvm_vg_name == sysinv.LVG_CINDER_VOLUMES:
return (sysinv.CINDER_BACKEND_LVM not in cinder_backend and
sysinv.PV_ADD in pv.pv_state)
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py
index 20999b5a..79399072 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py
@@ -231,10 +231,10 @@ class ForceLockHost(tables.BatchAction):
"unsuccessful and this host MUST be locked.\n\n"
"If you proceed, then this action will be logged"
" and cannot be undone.") % datum.hostname
- elif datum._personality == stx_api.sysinv.PERSONALITY_COMPUTE:
+ elif datum._personality == stx_api.sysinv.PERSONALITY_WORKER:
return _(
"
WARNING: This will cause a service OUTAGE"
- " for all VMs currently using resources on '%s'.\n\n"
+ " for all Applications currently using resources on '%s'.\n\n"
"To avoid service outages, click 'Cancel' and use"
" 'Lock Host' to gracefully migrate "
"resources away from this host. "
@@ -593,7 +593,7 @@ class HostsStorageFilterAction(tables.FilterAction):
return list(filter(comp, hosts))
-class HostsComputeFilterAction(tables.FilterAction):
+class HostsWorkerFilterAction(tables.FilterAction):
def filter(self, table, hosts, filter_string):
"""Naive case-insensitive search."""
q = filter_string.lower()
@@ -687,7 +687,7 @@ TASK_STATE_CHOICES = (
("none", True),
("Install Failed", False),
("Config out-of-date", False),
- ("Compute config required", False),
+ ("Worker config required", False),
("Reinstall required", False),
("Config out-of-date
Not Patch Current
Reboot Required",
False),
@@ -789,10 +789,10 @@ class HostsStorage(Hosts):
hidden_title = False
-class HostsCompute(Hosts):
+class HostsWorker(Hosts):
class Meta(object):
- name = "hostscompute"
- verbose_name = _("Compute Hosts")
+ name = "hostsworker"
+ verbose_name = _("Worker Hosts")
status_columns = ["task"]
row_class = UpdateRow
multi_select = True
@@ -802,7 +802,7 @@ class HostsCompute(Hosts):
PowerOnHost,
PowerOffHost, RebootHost,
ResetHost, ReinstallHost, PatchInstallAsync, DeleteHost)
- table_actions = (HostsComputeFilterAction, LockHost,
+ table_actions = (HostsWorkerFilterAction, LockHost,
UnlockHost, PatchInstallAsync)
hidden_title = False
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tabs.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tabs.py
index 5d1db519..ad736c21 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tabs.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tabs.py
@@ -41,7 +41,7 @@ LOG = logging.getLogger(__name__)
class HostsTab(tabs.TableTab):
table_classes = (toplevel_tables.HostsController,
toplevel_tables.HostsStorage,
- toplevel_tables.HostsCompute,
+ toplevel_tables.HostsWorker,
toplevel_tables.HostsUnProvisioned,)
name = _("Hosts")
slug = "hosts"
@@ -111,10 +111,10 @@ class HostsTab(tabs.TableTab):
return storages
- def get_hostscompute_data(self):
- computes = self.get_hosts_data(stx_api.sysinv.PERSONALITY_COMPUTE)
+ def get_hostsworker_data(self):
+ workers = self.get_hosts_data(stx_api.sysinv.PERSONALITY_WORKER)
- return computes
+ return workers
def get_hostsunprovisioned_data(self):
unprovisioned = self.get_hosts_data(stx_api.sysinv.PERSONALITY_UNKNOWN)
@@ -134,12 +134,12 @@ class HostsTab(tabs.TableTab):
controllers = context['hostscontroller_table'].data
storages = context['hostsstorage_table'].data
- computes = context['hostscompute_table'].data
+ workers = context['hostsworker_table'].data
unprovisioned = context['hostsunprovisioned_table'].data
context['controllers'] = controllers
context['storages'] = storages
- context['computes'] = computes
+ context['workers'] = workers
context['unprovisioned'] = unprovisioned
totals = []
@@ -163,7 +163,7 @@ class HostsTab(tabs.TableTab):
elif h._availability == 'failed':
fail_cnt += 1
- for h in computes:
+ for h in workers:
comp_cnt += 1
if h._availability == 'degraded':
degr_cnt += 1
@@ -183,7 +183,7 @@ class HostsTab(tabs.TableTab):
if (comp_cnt > 0):
badge = "badge-success"
totals.append(
- {'name': "Compute", 'value': comp_cnt, 'badge': badge})
+ {'name': "Worker", 'value': comp_cnt, 'badge': badge})
if (degr_cnt > 0):
badge = "badge-warning"
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/templates/inventory/_hosts.html b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/templates/inventory/_hosts.html
index 8e3c5aef..916e04d1 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/templates/inventory/_hosts.html
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/templates/inventory/_hosts.html
@@ -25,9 +25,9 @@
{% endif %}