From c40413518af8ae4f7415140e6006ec50653024a1 Mon Sep 17 00:00:00 2001 From: Randall Burt Date: Wed, 14 Dec 2016 09:47:43 -0600 Subject: [PATCH] Use correct context synching status Use the trust context when synching cluster status with orchestration status. Change-Id: I8ae0d1b92c3adce83032bb6c5f269d8d23c20c5e Partial-Blueprint: bp-driver-consolodation Closes-Bug: #1651243 --- magnum/drivers/heat/driver.py | 9 ++++++--- .../conductor/handlers/test_mesos_cluster_conductor.py | 3 ++- .../conductor/handlers/test_swarm_cluster_conductor.py | 3 ++- magnum/tests/unit/drivers/test_heat_driver.py | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/magnum/drivers/heat/driver.py b/magnum/drivers/heat/driver.py index 683d043f25..933e72fa7a 100644 --- a/magnum/drivers/heat/driver.py +++ b/magnum/drivers/heat/driver.py @@ -22,6 +22,7 @@ from heatclient.common import template_utils from heatclient import exc as heatexc from magnum.common import clients +from magnum.common import context as mag_ctx from magnum.common import exception from magnum.common import short_id from magnum.conductor.handlers.common import cert_manager @@ -73,7 +74,9 @@ class HeatDriver(driver.Driver): raise NotImplementedError("Must implement 'get_template_definition'") def update_cluster_status(self, context, cluster): - poller = HeatPoller(clients.OpenStackClients(context), cluster, self) + stack_ctx = mag_ctx.make_cluster_context(cluster) + poller = HeatPoller(clients.OpenStackClients(stack_ctx), context, + cluster, self) poller.poll_and_check() def create_cluster(self, context, cluster, cluster_create_timeout): @@ -151,9 +154,9 @@ class HeatDriver(driver.Driver): class HeatPoller(object): - def __init__(self, openstack_client, cluster, cluster_driver): + def __init__(self, openstack_client, context, cluster, cluster_driver): self.openstack_client = openstack_client - self.context = self.openstack_client.context + self.context = context self.cluster = cluster self.cluster_template = conductor_utils.retrieve_cluster_template( self.context, cluster) diff --git a/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py index af9a57a1a6..f04b1d013d 100644 --- a/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py @@ -308,7 +308,8 @@ class TestClusterConductorWithMesos(base.TestCase): cluster_template = objects.ClusterTemplate( self.context, **self.cluster_template_dict) mock_retrieve_cluster_template.return_value = cluster_template - poller = heat_driver.HeatPoller(mock_openstack_client, cluster, + poller = heat_driver.HeatPoller(mock_openstack_client, + mock.MagicMock(), cluster, mesos_dr.Driver()) poller.get_version_info = mock.MagicMock() return (mock_heat_stack, cluster, poller) diff --git a/magnum/tests/unit/conductor/handlers/test_swarm_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_swarm_cluster_conductor.py index d162d8598f..65d79f4db2 100644 --- a/magnum/tests/unit/conductor/handlers/test_swarm_cluster_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_swarm_cluster_conductor.py @@ -435,7 +435,8 @@ class TestClusterConductorWithSwarm(base.TestCase): mock_retrieve_cluster_template.return_value = \ cluster_template mock_driver.return_value = swarm_dr.Driver() - poller = heat_driver.HeatPoller(mock_openstack_client, cluster, + poller = heat_driver.HeatPoller(mock_openstack_client, + mock.MagicMock(), cluster, swarm_dr.Driver()) poller.get_version_info = mock.MagicMock() return (mock_heat_stack, cluster, poller) diff --git a/magnum/tests/unit/drivers/test_heat_driver.py b/magnum/tests/unit/drivers/test_heat_driver.py index 41d4f44322..9e05210bb2 100644 --- a/magnum/tests/unit/drivers/test_heat_driver.py +++ b/magnum/tests/unit/drivers/test_heat_driver.py @@ -45,7 +45,8 @@ class TestHeatPoller(base.TestCase): **cluster_template_dict) mock_retrieve_cluster_template.return_value = cluster_template mock_driver.return_value = k8s_atomic_dr.Driver() - poller = heat_driver.HeatPoller(mock_openstack_client, cluster, + poller = heat_driver.HeatPoller(mock_openstack_client, + mock.MagicMock(), cluster, k8s_atomic_dr.Driver()) poller.get_version_info = mock.MagicMock() return (mock_heat_stack, cluster, poller)