339c1f334c
The convention is to use the same queue name ("tripleo") for all
workflows. This can lead to messages showing from other tripleoclient
triggered workflows showing up during message polling if multiple
workflows are running at the same time.
This patch adds a check that will filter out any messages that do not
belong to the execution that is being waited on by comparing the
execution id with the root_execution_id returned in the execution
payload.
Depends-On: Icbe80c338d69efc6ce8fceb0f73f833bec588536
Change-Id: Ie6473d6a1044cdf76552d62645b4d63da2df9398
Related-Bug: #1794277
80 lines
2.5 KiB
Python
80 lines
2.5 KiB
Python
# Copyright 2018 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import mock
|
|
from osc_lib.tests import utils
|
|
|
|
from tripleoclient.tests import fakes
|
|
|
|
|
|
class FakeClientWrapper(object):
|
|
|
|
def __init__(self):
|
|
self._instance = mock.Mock()
|
|
self.object_store = FakeObjectClient()
|
|
|
|
def messaging_websocket(self, queue="tripleo"):
|
|
return fakes.FakeWebSocket()
|
|
|
|
|
|
class FakeObjectClient(object):
|
|
|
|
def __init__(self):
|
|
self._instance = mock.Mock()
|
|
self.put_object = mock.Mock()
|
|
|
|
def get_object(self, *args):
|
|
return
|
|
|
|
|
|
class TestFFWDUpgradePrepare(utils.TestCommand):
|
|
|
|
def setUp(self):
|
|
super(TestFFWDUpgradePrepare, self).setUp()
|
|
|
|
self.app.client_manager.auth_ref = mock.Mock(auth_token="TOKEN")
|
|
self.app.client_manager.baremetal = mock.Mock()
|
|
self.app.client_manager.orchestration = mock.Mock()
|
|
self.app.client_manager.tripleoclient = FakeClientWrapper()
|
|
workflow = execution = mock.Mock()
|
|
execution.id = "IDID"
|
|
workflow.executions.create.return_value = execution
|
|
self.app.client_manager.workflow_engine = workflow
|
|
|
|
|
|
class TestFFWDUpgradeRun(utils.TestCommand):
|
|
|
|
def setUp(self):
|
|
super(TestFFWDUpgradeRun, self).setUp()
|
|
|
|
self.app.client_manager.auth_ref = mock.Mock(auth_token="TOKEN")
|
|
self.app.client_manager.tripleoclient = FakeClientWrapper()
|
|
self.app.client_manager.workflow_engine = mock.Mock()
|
|
|
|
|
|
class TestFFWDUpgradeConverge(utils.TestCommand):
|
|
|
|
def setUp(self):
|
|
super(TestFFWDUpgradeConverge, self).setUp()
|
|
|
|
self.app.client_manager.auth_ref = mock.Mock(auth_token="TOKEN")
|
|
self.app.client_manager.baremetal = mock.Mock()
|
|
self.app.client_manager.orchestration = mock.Mock()
|
|
self.app.client_manager.tripleoclient = FakeClientWrapper()
|
|
workflow = execution = mock.Mock()
|
|
execution.id = "IDID"
|
|
workflow.executions.create.return_value = execution
|
|
self.app.client_manager.workflow_engine = workflow
|