Merge "Add metadata for default NIC and Bond attributes"
This commit is contained in:
commit
279b8ed1a2
|
@ -968,7 +968,8 @@ class TestBondAttributesDefaultsHandler(BaseIntegrationTest):
|
|||
},
|
||||
'plugin_a_with_bond_attributes': {
|
||||
'metadata': {
|
||||
'label': 'Test base plugin'
|
||||
'label': 'Test base plugin',
|
||||
'class': 'plugin'
|
||||
},
|
||||
'plugin_name_text': {
|
||||
'value': 'value',
|
||||
|
|
|
@ -87,6 +87,10 @@ class PluginAdapterBase(object):
|
|||
return set()
|
||||
return set([rel['version'] for rel in self.plugin.releases])
|
||||
|
||||
@property
|
||||
def title(self):
|
||||
return self.plugin.title
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self.plugin.name
|
||||
|
|
|
@ -34,6 +34,7 @@ from nailgun.objects.plugin import NodeNICInterfaceClusterPlugin
|
|||
from nailgun.objects.plugin import Plugin
|
||||
from nailgun.objects.plugin import PluginCollection
|
||||
from nailgun.settings import settings
|
||||
from nailgun.utils import dict_merge
|
||||
from nailgun.utils import dict_update
|
||||
from nailgun.utils import get_in
|
||||
|
||||
|
@ -513,6 +514,10 @@ class PluginManager(object):
|
|||
for plugin_adapter in six.moves.map(wrap_plugin, enabled_plugins):
|
||||
metadata = plugin_adapter.bond_attributes_metadata
|
||||
if metadata:
|
||||
metadata = dict_merge({
|
||||
'metadata': {
|
||||
'label': plugin_adapter.title, 'class': 'plugin'}},
|
||||
metadata)
|
||||
plugins_bond_metadata[plugin_adapter.name] = metadata
|
||||
|
||||
return plugins_bond_metadata
|
||||
|
@ -566,6 +571,10 @@ class PluginManager(object):
|
|||
for plugin_adapter in six.moves.map(wrap_plugin, enabled_plugins):
|
||||
metadata = plugin_adapter.nic_attributes_metadata
|
||||
if metadata:
|
||||
metadata = dict_merge({
|
||||
'metadata': {
|
||||
'label': plugin_adapter.title, 'class': 'plugin'}},
|
||||
metadata)
|
||||
plugins_nic_metadata[plugin_adapter.name] = metadata
|
||||
|
||||
return plugins_nic_metadata
|
||||
|
|
|
@ -779,8 +779,12 @@ class TestNICIntegration(base.BaseTestCase):
|
|||
default_attributes = PluginManager.get_nic_default_attributes(
|
||||
self.cluster)
|
||||
self.assertDictEqual({
|
||||
'plugin_a': {'attr_a': {'value': 'test_a'}},
|
||||
'plugin_b': {'attr_b': {'value': 'test_b'}}
|
||||
'plugin_a': {
|
||||
'metadata': {'label': 'Test plugin', 'class': 'plugin'},
|
||||
'attr_a': {'value': 'test_a'}},
|
||||
'plugin_b': {
|
||||
'metadata': {'label': 'Test plugin', 'class': 'plugin'},
|
||||
'attr_b': {'value': 'test_b'}}
|
||||
}, default_attributes)
|
||||
|
||||
def test_get_nic_plugin_atributes(self):
|
||||
|
|
Loading…
Reference in New Issue