openstack
/
fuel-web
Code Issues Proposed changes

Plugin package v5.0.0 support introduced 

Plugins v5.0.0 use task-based deployment directives using tasks
v2.0.0 with cross-dependencies and per-task strategy.

V4.0.0 allows both experimental and granular deployment directives
(tasks v1.0.0 and tasks v2.0.0) and using them according to `task_deploy`
environment flag setting.

Change-Id: I697dc22a58a9ff2ad8bd9d955d2b2c5351c746ab
Closes-Bug: #1533771
This commit is contained in:
Ilya Kutukov 2016-01-15 21:35:31 +03:00
parent 1b454cc243
commit 3ecb245061
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nailgun/nailgun/consts.py
View File

@ -456,8 +456,12 @@ TASK_ROLES = Enum(
OVERRIDE_CONFIG_BASE_PATH = '/etc/hiera/override/configuration/'
# Task version from which cross-dependencies is used
TASK_CROSS_DEPENDENCY = '2.0.0'
# From which (major) plugins package version task based is strictly required
TASK_DEPLOY_STRICT_FROM_VER = '5.0.0'
IRONIC_BOOTSTRAP_PKGS = ('openssh-server',
'ntp',
'fuel-agent',

7
nailgun/nailgun/plugins/adapters.py
View File

@ -300,11 +300,16 @@ class PluginAdapterV4(PluginAdapterV3):
self._update_plugin(db_config_metadata_mapping)
class PluginAdapterV5(PluginAdapterV4):
"""Plugin wrapper class for package version 5.0.0"""
__version_mapping = {
'1.0.': PluginAdapterV1,
'2.0.': PluginAdapterV2,
'3.0.': PluginAdapterV3,
'4.0.': PluginAdapterV4
'4.0.': PluginAdapterV4,
'5.0.': PluginAdapterV5,
}

13
nailgun/nailgun/test/unit/test_object_plugin.py
View File

@ -13,7 +13,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from nailgun import consts
from nailgun.objects import ClusterPlugins
from nailgun.objects import Plugin
@ -27,7 +26,7 @@ class ExtraFunctions(base.BaseTestCase):
def _create_test_plugins(self):
plugin_ids = []
for version in ['1.0.0', '2.0.0', '0.0.1', '3.0.0']:
for version in ['1.0.0', '2.0.0', '0.0.1', '3.0.0', '4.0.0', '5.0.0']:
plugin_data = self.env.get_default_plugin_metadata(
version=version,
name='multiversion_plugin')
@ -79,7 +78,7 @@ class TestPluginCollection(ExtraFunctions):
self.assertEqual(len(single_plugin), 1)
self.assertEqual(len(multiversion_plugin), 1)
self.assertEqual(multiversion_plugin[0].version, '3.0.0')
self.assertEqual(multiversion_plugin[0].version, '5.0.0')
def test_get_by_uids(self):
plugin_ids = self._create_test_plugins()
@ -105,7 +104,7 @@ class TestClusterPlugins(ExtraFunctions):
cluster_plugins = self.db.execute(
meta.tables['cluster_plugins'].select()
).fetchall()
self.assertEqual(len(cluster_plugins), 5)
self.assertEqual(len(cluster_plugins), 7)
def test_set_plugin_attributes(self):
meta = base.reflect_db_metadata()
@ -128,14 +127,14 @@ class TestClusterPlugins(ExtraFunctions):
cluster = self._create_test_cluster()
number_of_connected_plugins_data_items =\
ClusterPlugins.get_connected_plugins_data(cluster.id).count()
self.assertEqual(5, number_of_connected_plugins_data_items)
self.assertEqual(7, number_of_connected_plugins_data_items)
def test_get_all_connected_plugins(self):
self._create_test_plugins()
cluster = self._create_test_cluster()
number_of_connected_plugins =\
ClusterPlugins.get_connected_plugins(cluster).count()
self.assertEqual(5, number_of_connected_plugins)
self.assertEqual(7, number_of_connected_plugins)
def test_get_connected_for_specific_plugins(self):
plugin_ids = self._create_test_plugins()
@ -143,7 +142,7 @@ class TestClusterPlugins(ExtraFunctions):
number_of_connected_plugins =\
ClusterPlugins.get_connected_plugins(
cluster, plugin_ids[1:]).count()
self.assertEqual(4, number_of_connected_plugins)
self.assertEqual(6, number_of_connected_plugins)
def test_get_connected_clusters(self):
plugin_id = self._create_test_plugins()[0]