diff --git a/nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py b/nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py index 935aa4ec82..4f60680e33 100644 --- a/nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py +++ b/nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py @@ -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" + }] + } } } diff --git a/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handler.py b/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handler.py index c41ba120ec..223b3fce1d 100644 --- a/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handler.py +++ b/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handler.py @@ -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', diff --git a/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py b/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py index 3b815719bd..f764dfefca 100644 --- a/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py +++ b/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py @@ -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': { diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml index 796217885e..6d64c6dbe3 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -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: diff --git a/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py b/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py index 067fd8ec9e..7adbc4fb85 100644 --- a/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py +++ b/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py @@ -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" + }] + } } }