openstack
/
fuel-web
Code Issues Proposed changes

Merge "Hide DPDK section if experimental is turned off"

This commit is contained in:
Jenkins 2017-01-18 09:18:48 +00:00 committed by Gerrit Code Review
parent 8131924e6d e8732127dd
commit b697091131
5 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py
View File

@ -239,7 +239,13 @@ DEFAULT_RELEASE_NIC_NFV_ATTRIBUTES = {
{'settings:common.libvirt_type.value != \'kvm\'':
'Only KVM hypervisor works with DPDK'}
]},
'metadata': {'weight': 40, 'label': 'DPDK'}
'metadata': {
'weight': 40, 'label': 'DPDK',
'restrictions': [{
'condition': "not ('experimental' in version:feature_groups)",
'action': "hide"
}]
}
}
}
@ -292,7 +298,13 @@ DEFAULT_RELEASE_BOND_NFV_ATTRIBUTES = {
{'settings:common.libvirt_type.value != \'kvm\'':
'Only KVM hypervisor works with DPDK'}
]},
'metadata': {'weight': 40, 'label': 'DPDK'}
'metadata': {
'weight': 40, 'label': 'DPDK',
'restrictions': [{
'condition': "not ('experimental' in version:feature_groups)",
'action': "hide"
}]
}
}
}

14
nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handler.py
View File

@ -398,7 +398,12 @@ class TestHandlers(BaseIntegrationTest):
{
'metadata': {
'label': 'DPDK',
'weight': 40
'weight': 40,
'restrictions': [{
'condition':
"not ('experimental' in version:feature_groups)",
'action': "hide"
}]
},
'enabled': {
'label': 'Enable DPDK',
@ -1296,7 +1301,12 @@ class TestNICAttributesHandlers(BaseIntegrationTest):
'dpdk': {
'metadata': {
'label': 'DPDK',
'weight': 40
'weight': 40,
'restrictions': [{
'condition':
"not ('experimental' in version:feature_groups)",
'action': "hide"
}]
},
'enabled': {
'label': 'Enable DPDK',

7
nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py
View File

@ -917,7 +917,12 @@ class TestBondAttributesDefaultsHandler(BaseIntegrationTest):
},
'metadata': {
'label': 'DPDK',
'weight': 40
'weight': 40,
'restrictions': [{
'condition':
"not ('experimental' in version:feature_groups)",
'action': "hide"
}]
}
},
'lacp': {

6
nailgun/nailgun/fixtures/openstack.yaml
View File

@ -2166,6 +2166,9 @@
action: "none"
dpdk:
metadata:
restrictions:
- condition: "not ('experimental' in version:feature_groups)"
action: "hide"
label: "DPDK"
weight: 40
enabled:
@ -2217,6 +2220,9 @@
max: 65536
dpdk:
metadata:
restrictions:
- condition: "not ('experimental' in version:feature_groups)"
action: "hide"
label: "DPDK"
weight: 40
enabled:

16
nailgun/nailgun/test/unit/test_migration_fuel_9_2.py
View File

@ -147,7 +147,13 @@ DEFAULT_NIC_ATTRIBUTES = {
{'settings:common.libvirt_type.value != \'kvm\'':
'Only KVM hypervisor works with DPDK'}
]},
'metadata': {'weight': 40, 'label': 'DPDK'}
'metadata': {
'weight': 40, 'label': 'DPDK',
'restrictions': [{
'condition': "not ('experimental' in version:feature_groups)",
'action': "hide"
}]
}
}
}
@ -197,7 +203,13 @@ DEFAULT_BOND_ATTRIBUTES = {
{'settings:common.libvirt_type.value != \'kvm\'':
'Only KVM hypervisor works with DPDK'}
]},
'metadata': {'weight': 40, 'label': 'DPDK'}
'metadata': {
'weight': 40, 'label': 'DPDK',
'restrictions': [{
'condition': "not ('experimental' in version:feature_groups)",
'action': "hide"
}]
}
}
}