Rename cpu assigned_function names

Rename Applications to Application
Rename Isolated to Application-isolated

There is a similar update for stx/gui

Change-Id: Ie1dd4fb7e00ce28fc54266e3db402c5ac92e6b30
Partial-Bug: 1848973
Signed-off-by: David Sullivan <david.sullivan@windriver.com>
This commit is contained in:
David Sullivan 2019-10-29 13:30:20 -04:00
parent 837f644843
commit aadd95bd84
6 changed files with 30 additions and 31 deletions

View File

@ -502,9 +502,9 @@ def do_host_apply_profile(cc, args):
# Echo list of new memory
imemory = cc.imemory.list(host.uuid)
field_labels = ['uuid', 'vm_hugepages_1G', 'vm_hugepages_2M',
'vm_hugepages_2M_pending',
'vm_hugepages_1G_pending']
field_labels = ['uuid', 'application_hugepages_1G', 'application_hugepages_2M',
'application_hugepages_2M_pending',
'application_hugepages_1G_pending']
fields = ['uuid', 'vm_hugepages_nr_1G', 'vm_hugepages_nr_2M',
'vm_hugepages_nr_2M_pending', 'vm_hugepages_nr_1G_pending']
@ -612,8 +612,8 @@ def do_host_apply_memprofile(cc, args):
# Echo list of new host memory
imemory = cc.imemory.list(host.uuid)
field_labels = ['uuid', 'vm_hugepages_1G', 'vm_hugepages_2M',
'vm_hugepages_2M_pending', 'vm_hugepages_1G_pending',
field_labels = ['uuid', 'application_hugepages_1G', 'application_hugepages_2M',
'application_hugepages_2M_pending', 'application_hugepages_1G_pending',
'vswitch_hugepages_nr', 'vswitch_hugepages_size_reqd',
'vswitch_hugepages_size_mib']

View File

@ -20,8 +20,8 @@ CREATION_ATTRIBUTES = ['ihost_uuid', 'inode_uuid', 'cpu', 'core', 'thread',
PLATFORM_CPU_TYPE = "Platform"
VSWITCH_CPU_TYPE = "Vswitch"
SHARED_CPU_TYPE = "Shared"
APPLICATION_CPU_TYPE = "Applications"
ISOLATED_CPU_TYPE = "Isolated"
APPLICATION_CPU_TYPE = "Application"
ISOLATED_CPU_TYPE = "Application-isolated"
NONE_CPU_TYPE = "None"
CPU_TYPE_LIST = [PLATFORM_CPU_TYPE, VSWITCH_CPU_TYPE,
@ -32,8 +32,8 @@ CPU_TYPE_LIST = [PLATFORM_CPU_TYPE, VSWITCH_CPU_TYPE,
PLATFORM_CPU_TYPE_FORMAT = _("Platform")
VSWITCH_CPU_TYPE_FORMAT = _("vSwitch")
SHARED_CPU_TYPE_FORMAT = _("Shared")
APPLICATION_CPU_TYPE_FORMAT = _("Applications")
ISOLATED_CPU_TYPE_FORMAT = _("Isolated")
APPLICATION_CPU_TYPE_FORMAT = _("Application")
ISOLATED_CPU_TYPE_FORMAT = _("Application-isolated")
NONE_CPU_TYPE_FORMAT = _("None")
CPU_TYPE_FORMATS = {PLATFORM_CPU_TYPE: PLATFORM_CPU_TYPE_FORMAT,

View File

@ -87,7 +87,7 @@ def do_host_cpu_list(cc, args):
help="Name or ID of host")
@utils.arg('-f', '--function',
metavar='<function>',
choices=['vswitch', 'shared', 'platform', 'isolated'],
choices=['vswitch', 'shared', 'platform', 'application-isolated'],
required=True,
help='The Core Function.')
@utils.arg('-p0', '--num_cores_on_processor0',

View File

@ -181,7 +181,7 @@ def get_cpuprofile_data(cc, iprofile):
iprofile.platform_cores = get_core_list_str(iprofile, icpu_utils.PLATFORM_CPU_TYPE)
iprofile.vswitch_cores = get_core_list_str(iprofile, icpu_utils.VSWITCH_CPU_TYPE)
iprofile.shared_cores = get_core_list_str(iprofile, icpu_utils.SHARED_CPU_TYPE)
iprofile.vms_cores = get_core_list_str(iprofile, icpu_utils.APPLICATION_CPU_TYPE)
iprofile.application_cores = get_core_list_str(iprofile, icpu_utils.APPLICATION_CPU_TYPE)
iprofile.isolated_cores = get_core_list_str(iprofile, icpu_utils.ISOLATED_CPU_TYPE)
@ -208,18 +208,17 @@ def do_cpuprofile_list(cc, args):
icpu_utils.VSWITCH_CPU_TYPE)
profile.shared_cores = get_core_list_str(profile,
icpu_utils.SHARED_CPU_TYPE)
profile.vms_cores = get_core_list_str(profile,
icpu_utils.APPLICATION_CPU_TYPE)
profile.application_cores = get_core_list_str(profile, icpu_utils.APPLICATION_CPU_TYPE)
profile.isolated_cores = get_core_list_str(profile,
icpu_utils.ISOLATED_CPU_TYPE)
field_labels = ['uuid', 'name',
'processors', 'phy cores per proc', 'hyperthreading',
'platform cores', 'vswitch cores', 'shared cores',
'vm cores', 'isolated_cores']
'application cores', 'application-isolated cores']
fields = ['uuid', 'profilename',
'sockets', 'physical_cores', 'hyperthreading',
'platform_cores', 'vswitch_cores', 'shared_cores', 'vms_cores',
'platform_cores', 'vswitch_cores', 'shared_cores', 'application_cores',
'isolated_cores']
utils.print_list(profiles, fields, field_labels, sortby=0)
@ -227,11 +226,11 @@ def do_cpuprofile_list(cc, args):
def _print_cpuprofile_show(cpuprofile):
labels = ['uuid', 'name',
'processors', 'phy cores per proc', 'hyperthreading',
'platform cores', 'vswitch cores', 'shared cores', 'vm cores',
'isolated_cores', 'created_at', 'updated_at']
'platform cores', 'vswitch cores', 'shared cores', 'application cores',
'application-isolated cores', 'created_at', 'updated_at']
fields = ['uuid', 'profilename',
'sockets', 'physical_cores', 'hyperthreading',
'platform_cores', 'vswitch_cores', 'shared_cores', 'vms_cores',
'platform_cores', 'vswitch_cores', 'shared_cores', 'application_cores',
'isolated_cores', 'created_at', 'updated_at']
data = [(f, getattr(cpuprofile, f, '')) for f in fields]
utils.print_tuple_list(data, labels)
@ -585,8 +584,8 @@ def get_memprofile_data(cc, iprofile):
iprofile.memory = cc.iprofile.list_imemorys(iprofile.uuid)
iprofile.nodes = cc.iprofile.list_inodes(iprofile.uuid)
iprofile.platform_reserved_mib = get_memoryconfig_platform(iprofile)
iprofile.vm_hugepages_2M = get_memoryconfig_2M(iprofile)
iprofile.vm_hugepages_1G = get_memoryconfig_1G(iprofile)
iprofile.application_hugepages_2M = get_memoryconfig_2M(iprofile)
iprofile.application_hugepages_1G = get_memoryconfig_1G(iprofile)
iprofile.vswitch_hugepages_nr = get_memoryconfig_vswitch_nr(iprofile)
iprofile.vswitch_hugepages_size_mib = get_memoryconfig_vswitch_size(iprofile)
@ -596,26 +595,26 @@ def do_memprofile_list(cc, args):
profiles = cc.iprofile.list_memory_profiles()
for profile in profiles:
profile.platform_reserved_mib = get_memoryconfig_platform(profile)
profile.vm_hugepages_2M = get_memoryconfig_2M(profile)
profile.vm_hugepages_1G = get_memoryconfig_1G(profile)
profile.application_hugepages_2M = get_memoryconfig_2M(profile)
profile.application_hugepages_1G = get_memoryconfig_1G(profile)
profile.vswitch_hugepages_nr = get_memoryconfig_vswitch_nr(profile)
profile.vswitch_hugepages_size_mib = get_memoryconfig_vswitch_size(profile)
field_labels = ['uuid', 'name', 'platform_reserved_mib',
'vm_hugepages_2M', 'vm_hugepages_1G',
'application_hugepages_2M', 'application_hugepages_1G',
'vswitch_hugepages_nr', 'vswitch_hugepages_size_mib']
fields = ['uuid', 'profilename', 'platform_reserved_mib',
'vm_hugepages_2M', 'vm_hugepages_1G',
'application_hugepages_2M', 'application_hugepages_1G',
'vswitch_hugepages_nr', 'vswitch_hugepages_size_mib']
utils.print_list(profiles, fields, field_labels, sortby=0)
def _print_memprofile_show(memoryprofile):
fields = ['profilename', 'platform_reserved_mib', 'vm_hugepages_2M',
'vm_hugepages_1G', 'vswitch_hugepages_nr',
fields = ['profilename', 'platform_reserved_mib', 'application_hugepages_2M',
'application_hugepages_1G', 'vswitch_hugepages_nr',
'vswitch_hugepages_size_mib', 'uuid', 'created_at', 'updated_at']
labels = ['name', 'platform_reserved_mib', 'vm_hugepages_2M',
'vm_hugepages_1G', 'vswitch_hugepages_nr',
labels = ['name', 'platform_reserved_mib', 'application_hugepages_2M',
'application_hugepages_1G', 'vswitch_hugepages_nr',
'vswitch_hugepages_size_mib', 'uuid', 'created_at', 'updated_at']
data = [(f, getattr(memoryprofile, f, '')) for f in fields]

View File

@ -597,7 +597,7 @@ def _update_isolated_cpu_counts(host, cpu, counts, capabilities=None):
count = int(count)
if count < 0:
raise wsme.exc.ClientSideError(
_('Isolated cpus must be non-negative.'))
_('Application-isolated cpus must be non-negative.'))
if host.hyperthreading:
# the data structures track the number of logical cpus and the
# API expects the requested count to refer to the number

View File

@ -114,8 +114,8 @@ LOWLATENCY = 'lowlatency'
PLATFORM_FUNCTION = "Platform"
VSWITCH_FUNCTION = "Vswitch"
SHARED_FUNCTION = "Shared"
APPLICATION_FUNCTION = "Applications"
ISOLATED_FUNCTION = "Isolated"
APPLICATION_FUNCTION = "Application"
ISOLATED_FUNCTION = "Application-isolated"
NO_FUNCTION = "None"
CPU_FUNCTIONS = [