x/tuskar-ui
Code Issues Proposed changes

Nodes registration updates

Browse Source 
Adds local boot_option to capabilities when creating node,
renames pxe_deploy_kernel/ramdisk to deploy_kernel/ramdisk

Change-Id: Iaab70df78d5ea83998498a4c9af2502deeea4435
This commit is contained in:
Jiri Tomasek 2015-06-10 08:28:02 +02:00
parent ac95523881
commit 651e5e9f9e
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tuskar_ui/api/node.py
View File

@ -128,11 +128,11 @@ class Node(base.APIResourceWrapper):
'ipmi_password': ipmi_password
}
driver_info.update(
pxe_deploy_kernel=deployment_kernel,
pxe_deploy_ramdisk=deployment_ramdisk
deploy_kernel=deployment_kernel,
deploy_ramdisk=deployment_ramdisk
)
properties = {}
properties = {'capabilities': 'boot_option:local', }
if cpus:
properties.update(cpus=cpus)
if memory_mb:

4
tuskar_ui/infrastructure/nodes/tabs.py
View File

@ -319,11 +319,11 @@ class DetailOverviewTab(tabs.Tab):
context['role'] = resource.role
context['stack'] = resource.stack
kernel_id = node.driver_info.get('pxe_deploy_kernel')
kernel_id = node.driver_info.get('deploy_kernel')
if kernel_id:
context['kernel_image'] = api.node.image_get(request, kernel_id)
ramdisk_id = node.driver_info.get('pxe_deploy_ramdisk')
ramdisk_id = node.driver_info.get('deploy_ramdisk')
if ramdisk_id:
context['ramdisk_image'] = api.node.image_get(request, ramdisk_id)

36
tuskar_ui/test/test_data/node_data.py
View File

@ -29,8 +29,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.2',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '8',
@ -56,8 +56,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.3',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '16',
@ -83,8 +83,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.4',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '32',
@ -110,8 +110,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.5',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '8',
@ -137,8 +137,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.6',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '8',
@ -164,8 +164,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.6',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '8',
@ -191,8 +191,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.7',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '8',
@ -218,8 +218,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.8',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '8',
@ -245,8 +245,8 @@ def data(TEST):
'ipmi_username': 'admin',
'ipmi_password': 'password',
'ip_address': '1.2.2.9',
'pxe_deploy_kernel': 'deploy-kernel-uuid',
'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
'deploy_kernel': 'deploy-kernel-uuid',
'deploy_ramdisk': 'deploy-ramdisk-uuid',
},
'properties': {
'cpus': '16',