starlingx
/
gui
Code Issues Proposed changes

Merge "Not show vswitch HP field if vswitch type is none"

This commit is contained in:
Zuul 2019-05-13 17:00:57 +00:00 committed by Gerrit Code Review
parent 09622b9221 9ae249e019
commit 319e9ab37b
2 changed files with 67 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/sysinv.py
View File

@ -2607,6 +2607,19 @@ def get_sdn_enabled(request):
return False return False
def get_vswitch_type(request):
try:
systems = system_list(request)
system_capabilities = systems[0].to_dict().get('capabilities')
vswitch_type = system_capabilities.get('vswitch_type', 'none')
if vswitch_type != 'none':
return vswitch_type
else:
return None
except Exception:
return None
def get_sdn_l3_mode_enabled(request): def get_sdn_l3_mode_enabled(request):
# Get the Service Parameter list on this host # Get the Service Parameter list on this host
# and ensure that the L3 Enabled service parameter # and ensure that the L3 Enabled service parameter

92
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/forms.py
View File

@ -142,6 +142,8 @@ class UpdateMemory(forms.SelfHandlingForm):
super(UpdateMemory, self).__init__(request, *args, **kwargs) super(UpdateMemory, self).__init__(request, *args, **kwargs)
self.host = kwargs['initial']['host'] self.host = kwargs['initial']['host']
self.vswitch_type = stx_api.sysinv.get_vswitch_type(request)
LOG.debug("vswitch_type is %s", self.vswitch_type)
memory_fieldsets = [ memory_fieldsets = [
{ {
@ -247,7 +249,12 @@ class UpdateMemory(forms.SelfHandlingForm):
if m.vswitch_hugepages_size_mib: if m.vswitch_hugepages_size_mib:
vswitch_hp_size_mib_field.initial = \ vswitch_hp_size_mib_field.initial = \
str(m.vswitch_hugepages_size_mib) str(m.vswitch_hugepages_size_mib)
if self.vswitch_type is None:
LOG.debug("vswitch_hp field is hidden")
vswitch_hp_size_mib_field.widget = \
forms.widgets.HiddenInput()
vswitch_hp_reqd_field.widget = \
forms.widgets.HiddenInput()
break break
while count < 4: while count < 4:
@ -322,15 +329,16 @@ class UpdateMemory(forms.SelfHandlingForm):
else: else:
pages_1G['node0'] = data['vm_hugepages_nr_1G'] pages_1G['node0'] = data['vm_hugepages_nr_1G']
if not data['vswitch_hugepages_size_mib']: if self.vswitch_type:
del data['vswitch_hugepages_size_mib'] if not data['vswitch_hugepages_size_mib']:
else: del data['vswitch_hugepages_size_mib']
pages_vs_size['node0'] = data['vswitch_hugepages_size_mib'] else:
pages_vs_size['node0'] = data['vswitch_hugepages_size_mib']
if not data['vswitch_hugepages_reqd']: if not data['vswitch_hugepages_reqd']:
del data['vswitch_hugepages_reqd'] del data['vswitch_hugepages_reqd']
else: else:
pages_vs_reqd['node0'] = data['vswitch_hugepages_reqd'] pages_vs_reqd['node0'] = data['vswitch_hugepages_reqd']
# Node 1 arguments # Node 1 arguments
if not data['platform_memory_two']: if not data['platform_memory_two']:
@ -348,15 +356,16 @@ class UpdateMemory(forms.SelfHandlingForm):
else: else:
pages_1G['node1'] = data['vm_hugepages_nr_1G_two'] pages_1G['node1'] = data['vm_hugepages_nr_1G_two']
if not data['vswitch_hugepages_size_mib_two']: if self.vswitch_type:
del data['vswitch_hugepages_size_mib_two'] if not data['vswitch_hugepages_size_mib_two']:
else: del data['vswitch_hugepages_size_mib_two']
pages_vs_size['node1'] = data['vswitch_hugepages_size_mib_two'] else:
pages_vs_size['node1'] = data['vswitch_hugepages_size_mib_two']
if not data['vswitch_hugepages_reqd_two']: if not data['vswitch_hugepages_reqd_two']:
del data['vswitch_hugepages_reqd_two'] del data['vswitch_hugepages_reqd_two']
else: else:
pages_vs_reqd['node1'] = data['vswitch_hugepages_reqd_two'] pages_vs_reqd['node1'] = data['vswitch_hugepages_reqd_two']
# Node 2 arguments # Node 2 arguments
if not data['platform_memory_three']: if not data['platform_memory_three']:
@ -374,15 +383,18 @@ class UpdateMemory(forms.SelfHandlingForm):
else: else:
pages_1G['node2'] = data['vm_hugepages_nr_1G_three'] pages_1G['node2'] = data['vm_hugepages_nr_1G_three']
if not data['vswitch_hugepages_size_mib_three']: if self.vswitch_type:
del data['vswitch_hugepages_size_mib_three'] if not data['vswitch_hugepages_size_mib_three']:
else: del data['vswitch_hugepages_size_mib_three']
pages_vs_size['node2'] = data['vswitch_hugepages_size_mib_three'] else:
pages_vs_size['node2'] = \
data['vswitch_hugepages_size_mib_three']
if not data['vswitch_hugepages_reqd']: if not data['vswitch_hugepages_reqd']:
del data['vswitch_hugepages_reqd'] del data['vswitch_hugepages_reqd']
else: else:
pages_vs_reqd['node2'] = data['vswitch_hugepages_reqd_three'] pages_vs_reqd['node2'] = \
data['vswitch_hugepages_reqd_three']
# Node 3 arguments # Node 3 arguments
if not data['platform_memory_four']: if not data['platform_memory_four']:
@ -400,15 +412,17 @@ class UpdateMemory(forms.SelfHandlingForm):
else: else:
pages_1G['node3'] = data['vm_hugepages_nr_1G_four'] pages_1G['node3'] = data['vm_hugepages_nr_1G_four']
if not data['vswitch_hugepages_size_mib_four']: if self.vswitch_type:
del data['vswitch_hugepages_size_mib_four'] if not data['vswitch_hugepages_size_mib_four']:
else: del data['vswitch_hugepages_size_mib_four']
pages_vs_size['node3'] = data['vswitch_hugepages_size_mib_four'] else:
pages_vs_size['node3'] = \
data['vswitch_hugepages_size_mib_four']
if not data['vswitch_hugepages_reqd_four']: if not data['vswitch_hugepages_reqd_four']:
del data['vswitch_hugepages_reqd_four'] del data['vswitch_hugepages_reqd_four']
else: else:
pages_vs_reqd['node3'] = data['vswitch_hugepages_reqd_four'] pages_vs_reqd['node3'] = data['vswitch_hugepages_reqd_four']
try: try:
for nd in node: for nd in node:
@ -432,11 +446,13 @@ class UpdateMemory(forms.SelfHandlingForm):
new_data['vm_hugepages_nr_2M_pending'] = pages_2M[nd] new_data['vm_hugepages_nr_2M_pending'] = pages_2M[nd]
if nd in pages_1G: if nd in pages_1G:
new_data['vm_hugepages_nr_1G_pending'] = pages_1G[nd] new_data['vm_hugepages_nr_1G_pending'] = pages_1G[nd]
if nd in pages_vs_size: if self.vswitch_type:
new_data['vswitch_hugepages_size_mib'] = \ if nd in pages_vs_size:
pages_vs_size[nd] new_data['vswitch_hugepages_size_mib'] = \
if nd in pages_vs_reqd: pages_vs_size[nd]
new_data['vswitch_hugepages_reqd'] = pages_vs_reqd[nd] if nd in pages_vs_reqd:
new_data['vswitch_hugepages_reqd'] = \
pages_vs_reqd[nd]
if new_data: if new_data:
stx_api.sysinv.host_memory_update(request, memory.uuid, stx_api.sysinv.host_memory_update(request, memory.uuid,