Peter Stachowski
51f2655770
In order to allow clusters to be all on the same hypervisor (affinity) or all on different hypervisors (anti-affinity) a new argument (locality) needed to be added to the Trove cluster-create API. This changeset addresses the Trove server part of this feature. 'locality' can now be added to the ReST payload for a cluster-create command and it is passed along as a scheduler hint to Nova. The cluster scenario tests were enhanced to test that 'affinity' works. Testing that 'anti-affinity' fails proved to be too time consuming, since at present the only way for a cluster to 'fail' is to timeout (and that takes 10 hours). The server-group is checked to make sure it is created properly, and that it has been deleted after all the related instances are gone. DocImpact: New functionality Partially implements: blueprint replication-cluster-locality Depends-On: Ie46cfa69ffe6a64760aca38c495563f5724bd0d0 Change-Id: I657bf5c023d0257e462cc39f57c16eb6ee83807a
48 lines
1.9 KiB
Python
48 lines
1.9 KiB
Python
# Copyright 2014 eBay Software Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
from mock import Mock, patch
|
|
|
|
from trove.cluster import models
|
|
from trove.common.strategies.cluster.experimental.mongodb.api import (
|
|
MongoDbCluster)
|
|
from trove.datastore import models as datastore_models
|
|
from trove.instance import models as instance_models
|
|
from trove.tests.unittests import trove_testtools
|
|
|
|
|
|
class TestClusterModel(trove_testtools.TestCase):
|
|
|
|
@patch.object(datastore_models.Datastore, 'load')
|
|
@patch.object(datastore_models.DatastoreVersion, 'load_by_uuid')
|
|
@patch.object(models.DBCluster, 'find_by')
|
|
@patch.object(instance_models.Instances, 'load_all_by_cluster_id')
|
|
def test_load(self, mock_inst_load, mock_find_by,
|
|
mock_load_dsv_by_uuid, mock_ds_load):
|
|
context = trove_testtools.TroveTestContext(self)
|
|
id = Mock()
|
|
inst_mock = Mock()
|
|
server_group = Mock()
|
|
inst_mock.server_group = server_group
|
|
mock_inst_load.return_value = [inst_mock]
|
|
|
|
dsv = Mock()
|
|
dsv.manager = 'mongodb'
|
|
mock_load_dsv_by_uuid.return_value = dsv
|
|
cluster = models.Cluster.load(context, id)
|
|
self.assertIsInstance(cluster, MongoDbCluster)
|
|
self.assertEqual(server_group, cluster.server_group,
|
|
"Unexpected server group")
|