Merge "Add orig and seed env versions to astute.yaml"
This commit is contained in:
commit
ab17ac75ea
|
@ -17,6 +17,7 @@
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from nailgun import extensions
|
from nailgun import extensions
|
||||||
|
from nailgun.objects import Cluster
|
||||||
|
|
||||||
from cluster_upgrade import handlers
|
from cluster_upgrade import handlers
|
||||||
|
|
||||||
|
@ -27,10 +28,16 @@ class UpgradePipeline(extensions.BasePipeline):
|
||||||
from cluster_upgrade.objects.relations import UpgradeRelationObject
|
from cluster_upgrade.objects.relations import UpgradeRelationObject
|
||||||
|
|
||||||
relation = UpgradeRelationObject.get_cluster_relation(cluster.id)
|
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'] = {
|
cluster_data['upgrade'] = {
|
||||||
'relation_info': {
|
'relation_info': {
|
||||||
'orig_cluster_id': relation.orig_cluster_id,
|
'orig_cluster_id': relation.orig_cluster_id,
|
||||||
'seed_cluster_id': relation.seed_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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,10 +53,15 @@ class TestPipeline(base.BaseCloneClusterTest):
|
||||||
self.dst_cluster_db, []
|
self.dst_cluster_db, []
|
||||||
)
|
)
|
||||||
|
|
||||||
|
orig_release = self.src_cluster_db.release
|
||||||
|
seed_release = self.dst_cluster_db.release
|
||||||
|
|
||||||
expected = {
|
expected = {
|
||||||
'relation_info': {
|
'relation_info': {
|
||||||
'orig_cluster_id': self.src_cluster_db.id,
|
'orig_cluster_id': self.src_cluster_db.id,
|
||||||
'seed_cluster_id': self.dst_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,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue