From 595146163ef4c44c0061e97d7be7427daeae9c2d Mon Sep 17 00:00:00 2001 From: Pavel Chechetin Date: Thu, 22 Sep 2016 16:24:30 +0300 Subject: [PATCH] Add orig and seed env versions to astute.yaml Change-Id: Ic5eb4b4308feba55cbb97ebc63c1a41b4ed14de8 --- cluster_upgrade/extension.py | 7 +++++++ cluster_upgrade/tests/test_extension.py | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/cluster_upgrade/extension.py b/cluster_upgrade/extension.py index ccda7a3..1233bea 100644 --- a/cluster_upgrade/extension.py +++ b/cluster_upgrade/extension.py @@ -17,6 +17,7 @@ import os from nailgun import extensions +from nailgun.objects import Cluster from cluster_upgrade import handlers @@ -27,10 +28,16 @@ class UpgradePipeline(extensions.BasePipeline): from cluster_upgrade.objects.relations import UpgradeRelationObject relation = UpgradeRelationObject.get_cluster_relation(cluster.id) + + orig_env = Cluster.get_by_uid(relation.orig_cluster_id) + seed_env = Cluster.get_by_uid(relation.seed_cluster_id) + cluster_data['upgrade'] = { 'relation_info': { 'orig_cluster_id': relation.orig_cluster_id, 'seed_cluster_id': relation.seed_cluster_id, + 'orig_cluster_version': orig_env.release.environment_version, + 'seed_cluster_version': seed_env.release.environment_version } } diff --git a/cluster_upgrade/tests/test_extension.py b/cluster_upgrade/tests/test_extension.py index 39166ff..d0d768d 100644 --- a/cluster_upgrade/tests/test_extension.py +++ b/cluster_upgrade/tests/test_extension.py @@ -53,10 +53,15 @@ class TestPipeline(base.BaseCloneClusterTest): self.dst_cluster_db, [] ) + orig_release = self.src_cluster_db.release + seed_release = self.dst_cluster_db.release + expected = { 'relation_info': { 'orig_cluster_id': self.src_cluster_db.id, 'seed_cluster_id': self.dst_cluster_db.id, + 'orig_cluster_version': orig_release.environment_version, + 'seed_cluster_version': seed_release.environment_version, } }