296558a05e
This patch covers next topics: 1) Changes db deploymnet model to store admin endpoint and list of non-admin users 2) Changes objects.deployment to have this admin and users instead of endpoints 3) Changes input format of ExistingCloud engine, to make it easy to pass users & admins 4) Changes engine.bind method to accept admin and list of users 5) Code cleanup related to removing list of endpoints and making admin/non-admin stuff 6) Fix CLI code related to deployment model change 7) Fix docs & samples 8) Fixing all related tests In next patch we should drop default "users" context and use users from deployment if they are passed. Change-Id: Ifb469d80c61ee5f26f313db75c98a6d496bcdb92
204 lines
8.4 KiB
Python
204 lines
8.4 KiB
Python
# Copyright 2013: Mirantis Inc.
|
|
# 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.
|
|
|
|
"""Tests for db.deploy layer."""
|
|
|
|
|
|
import mock
|
|
|
|
from rally import consts
|
|
from rally import objects
|
|
from tests import test
|
|
|
|
|
|
class DeploymentTestCase(test.TestCase):
|
|
def setUp(self):
|
|
super(DeploymentTestCase, self).setUp()
|
|
self.deployment = {
|
|
'uuid': 'baa1bfb6-0c38-4f6c-9bd0-45968890e4f4',
|
|
'name': '',
|
|
'config': {},
|
|
'endpoint': {},
|
|
'status': consts.DeployStatus.DEPLOY_INIT,
|
|
}
|
|
self.resource = {
|
|
'id': 42,
|
|
'deployment_uuid': self.deployment['uuid'],
|
|
'provider_name': 'provider',
|
|
'type': 'some',
|
|
'info': {'key': 'value'},
|
|
}
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_create')
|
|
def test_init_with_create(self, mock_create):
|
|
mock_create.return_value = self.deployment
|
|
deploy = objects.Deployment()
|
|
mock_create.assert_called_once_with({})
|
|
self.assertEqual(deploy['uuid'], self.deployment['uuid'])
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_create')
|
|
def test_init_without_create(self, mock_create):
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
self.assertFalse(mock_create.called)
|
|
self.assertEqual(deploy['uuid'], self.deployment['uuid'])
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_get')
|
|
def test_get(self, mock_get):
|
|
mock_get.return_value = self.deployment
|
|
deploy = objects.Deployment.get(self.deployment['uuid'])
|
|
mock_get.assert_called_once_with(self.deployment['uuid'])
|
|
self.assertEqual(deploy['uuid'], self.deployment['uuid'])
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_delete')
|
|
@mock.patch('rally.objects.deploy.db.deployment_create')
|
|
def test_create_and_delete(self, mock_create, mock_delete):
|
|
mock_create.return_value = self.deployment
|
|
deploy = objects.Deployment()
|
|
deploy.delete()
|
|
mock_delete.assert_called_once_with(self.deployment['uuid'])
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_delete')
|
|
def test_delete_by_uuid(self, mock_delete):
|
|
objects.Deployment.delete_by_uuid(self.deployment['uuid'])
|
|
mock_delete.assert_called_once_with(self.deployment['uuid'])
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_update')
|
|
@mock.patch('rally.objects.deploy.db.deployment_create')
|
|
def test_update(self, mock_create, mock_update):
|
|
mock_create.return_value = self.deployment
|
|
mock_update.return_value = {'opt': 'val2'}
|
|
deploy = objects.Deployment(opt='val1')
|
|
deploy._update({'opt': 'val2'})
|
|
mock_update.assert_called_once_with(self.deployment['uuid'],
|
|
{'opt': 'val2'})
|
|
self.assertEqual(deploy['opt'], 'val2')
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_update')
|
|
def test_update_status(self, mock_update):
|
|
mock_update.return_value = self.deployment
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
deploy.update_status(consts.DeployStatus.DEPLOY_FAILED)
|
|
mock_update.assert_called_once_with(
|
|
self.deployment['uuid'],
|
|
{'status': consts.DeployStatus.DEPLOY_FAILED},
|
|
)
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_update')
|
|
def test_update_name(self, mock_update):
|
|
mock_update.return_value = self.deployment
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
deploy.update_name('new_name')
|
|
mock_update.assert_called_once_with(
|
|
self.deployment['uuid'],
|
|
{'name': 'new_name'},
|
|
)
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_update')
|
|
def test_update_config(self, mock_update):
|
|
mock_update.return_value = self.deployment
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
deploy.update_config({'opt': 'val'})
|
|
mock_update.assert_called_once_with(
|
|
self.deployment['uuid'],
|
|
{'config': {'opt': 'val'}},
|
|
)
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_update')
|
|
def test_update_endpoints(self, mock_update):
|
|
mock_update.return_value = self.deployment
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
endpoints = {
|
|
"admin": objects.Endpoint("url", "user", "pwd", "tenant",
|
|
consts.EndpointPermission.ADMIN),
|
|
"users": [
|
|
objects.Endpoint("url1", "user1", "pwd1", "tenant1",
|
|
consts.EndpointPermission.USER),
|
|
objects.Endpoint("url2", "user2", "pwd2", "tenant2",
|
|
consts.EndpointPermission.USER),
|
|
]
|
|
}
|
|
|
|
expected_users = [u.to_dict(include_permission=True)
|
|
for u in endpoints["users"]]
|
|
|
|
deploy.update_endpoints(endpoints)
|
|
mock_update.assert_called_once_with(
|
|
self.deployment["uuid"],
|
|
{
|
|
"admin": endpoints["admin"].to_dict(include_permission=True),
|
|
"users": expected_users
|
|
})
|
|
|
|
@mock.patch('rally.objects.deploy.db.deployment_update')
|
|
def test_update_empty_endpoints(self, mock_update):
|
|
mock_update.return_value = self.deployment
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
deploy.update_endpoints({})
|
|
mock_update.assert_called_once_with(self.deployment["uuid"],
|
|
{"admin": {}, "users": []})
|
|
|
|
@mock.patch('rally.objects.deploy.db.resource_create')
|
|
def test_add_resource(self, mock_create):
|
|
mock_create.return_value = self.resource
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
resource = deploy.add_resource('provider', type='some',
|
|
info={'key': 'value'})
|
|
self.assertEqual(resource['id'], self.resource['id'])
|
|
mock_create.assert_called_once_with({
|
|
'deployment_uuid': self.deployment['uuid'],
|
|
'provider_name': 'provider',
|
|
'type': 'some',
|
|
'info': {'key': 'value'},
|
|
})
|
|
|
|
@mock.patch('rally.objects.task.db.resource_delete')
|
|
def test_delete(self, mock_delete):
|
|
objects.Deployment.delete_resource(42)
|
|
mock_delete.assert_called_once_with(42)
|
|
|
|
@mock.patch('rally.objects.task.db.resource_get_all')
|
|
def test_get_resources(self, mock_get_all):
|
|
mock_get_all.return_value = [self.resource]
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
resources = deploy.get_resources(provider_name='provider', type='some')
|
|
self.assertEqual(len(resources), 1)
|
|
self.assertEqual(resources[0]['id'], self.resource['id'])
|
|
|
|
@mock.patch('rally.objects.deploy.datetime.datetime')
|
|
@mock.patch('rally.objects.deploy.db.deployment_update')
|
|
def test_update_set_started(self, mock_update, mock_datetime):
|
|
mock_datetime.now = mock.Mock(return_value='fake_time')
|
|
mock_update.return_value = self.deployment
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
deploy.set_started()
|
|
mock_update.assert_called_once_with(
|
|
self.deployment['uuid'],
|
|
{'started_at': 'fake_time',
|
|
'status': consts.DeployStatus.DEPLOY_STARTED}
|
|
)
|
|
|
|
@mock.patch('rally.objects.deploy.datetime.datetime')
|
|
@mock.patch('rally.objects.deploy.db.deployment_update')
|
|
def test_update_set_completed(self, mock_update, mock_datetime):
|
|
mock_datetime.now = mock.Mock(return_value='fake_time')
|
|
mock_update.return_value = self.deployment
|
|
deploy = objects.Deployment(deployment=self.deployment)
|
|
deploy.set_completed()
|
|
mock_update.assert_called_once_with(
|
|
self.deployment['uuid'],
|
|
{'completed_at': 'fake_time',
|
|
'status': consts.DeployStatus.DEPLOY_FINISHED}
|
|
)
|