Erik Olof Gunnar Andersson
1924abff40
In the current implementation, if for any reason a duplicate service entry gets created, the call to update that service will fail endlessly, and instead cause the service to create new entries everytime update_service_status gets called. Causing it to fill the database with duplicate entries. This patch adds a unique constraint to the service_statuses table based on the service_name and hostname, to ensure that this cannot happen. In addition we add a new test to the storage driver and further expanded the central service test coverage. Change-Id: I307a8f7dd8b8a83effa447a846db3288efa32dba Closes-Bug: #1768824
106 lines
3.6 KiB
Python
106 lines
3.6 KiB
Python
# Copyright 2016 Hewlett Packard Enterprise Development Company LP
|
|
#
|
|
# 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
|
|
import oslotest.base
|
|
from oslo_config import cfg
|
|
|
|
from designate import objects
|
|
from designate import service_status
|
|
|
|
|
|
class NoopEmitterTest(oslotest.base.BaseTestCase):
|
|
def setUp(self):
|
|
super(NoopEmitterTest, self).setUp()
|
|
self.mock_tg = mock.Mock()
|
|
|
|
def test_init(self):
|
|
service_status.NoopEmitter("svc", self.mock_tg)
|
|
|
|
def test_start(self):
|
|
emitter = service_status.NoopEmitter("svc", self.mock_tg)
|
|
emitter.start()
|
|
|
|
self.mock_tg.add_timer.assert_called_once_with(
|
|
5.0, emitter._emit_heartbeat)
|
|
|
|
def test_stop(self):
|
|
mock_pulse = mock.Mock()
|
|
self.mock_tg.add_timer.return_value = mock_pulse
|
|
|
|
emitter = service_status.NoopEmitter("svc", self.mock_tg)
|
|
emitter.start()
|
|
emitter.stop()
|
|
|
|
self.assertFalse(emitter._running)
|
|
|
|
|
|
class RpcEmitterTest(oslotest.base.BaseTestCase):
|
|
def setUp(self):
|
|
super(RpcEmitterTest, self).setUp()
|
|
self.mock_tg = mock.Mock()
|
|
|
|
@mock.patch.object(objects, "ServiceStatus")
|
|
@mock.patch("designate.context.DesignateContext.get_admin_context")
|
|
def test_emit_no_status_factory(self, mock_context, mock_service_status):
|
|
emitter = service_status.RpcEmitter("svc", self.mock_tg)
|
|
emitter.start()
|
|
|
|
central = mock.Mock()
|
|
with mock.patch("designate.central.rpcapi.CentralAPI.get_instance",
|
|
return_value=central):
|
|
emitter._emit_heartbeat()
|
|
|
|
mock_service_status.assert_called_once_with(
|
|
service_name="svc",
|
|
hostname=cfg.CONF.host,
|
|
status=True,
|
|
stats={},
|
|
capabilities={},
|
|
heartbeated_at=mock.ANY
|
|
)
|
|
|
|
central.update_service_status.assert_called_once_with(
|
|
mock_context.return_value, mock_service_status.return_value
|
|
)
|
|
|
|
@mock.patch.object(objects, "ServiceStatus")
|
|
@mock.patch("designate.context.DesignateContext.get_admin_context")
|
|
def test_emit_status_factory(self, mock_context, mock_service_status):
|
|
status = False
|
|
stats = {"a": 1}
|
|
capabilities = {"b": 2}
|
|
|
|
status_factory = mock.Mock(return_value=(status, stats, capabilities,))
|
|
emitter = service_status.RpcEmitter("svc", self.mock_tg,
|
|
status_factory=status_factory)
|
|
emitter.start()
|
|
|
|
central = mock.Mock()
|
|
with mock.patch("designate.central.rpcapi.CentralAPI.get_instance",
|
|
return_value=central):
|
|
emitter._emit_heartbeat()
|
|
|
|
mock_service_status.assert_called_once_with(
|
|
service_name="svc",
|
|
hostname=cfg.CONF.host,
|
|
status=status,
|
|
stats=stats,
|
|
capabilities=capabilities,
|
|
heartbeated_at=mock.ANY
|
|
)
|
|
|
|
central.update_service_status.assert_called_once_with(
|
|
mock_context.return_value, mock_service_status.return_value
|
|
)
|