e59fd874e5
Latest python-saharaclient (already in Heat dependencies) has ability to provide availability zones for servers and volumes when creating node group templates. This patch adds support for this feature to OS::Sahara::NodeGroupTemplate resource in Heat. Change-Id: Ic74fd43f5d8c692ddb40d0c6cefa5ed6327dd654
241 lines
9.4 KiB
Python
241 lines
9.4 KiB
Python
# Copyright (c) 2014 Mirantis 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
|
|
import six
|
|
|
|
from heat.common import exception
|
|
from heat.common import template_format
|
|
from heat.engine.clients.os import neutron
|
|
from heat.engine.clients.os import nova
|
|
from heat.engine.clients.os import sahara
|
|
from heat.engine.resources import sahara_templates as st
|
|
from heat.engine import scheduler
|
|
from heat.tests import common
|
|
from heat.tests import utils
|
|
|
|
node_group_template = """
|
|
heat_template_version: 2013-05-23
|
|
description: Sahara Node Group Template
|
|
resources:
|
|
node-group:
|
|
type: OS::Sahara::NodeGroupTemplate
|
|
properties:
|
|
name: node-group-template
|
|
plugin_name: vanilla
|
|
hadoop_version: 2.3.0
|
|
flavor: m1.large
|
|
floating_ip_pool: some_pool_name
|
|
node_processes:
|
|
- namenode
|
|
- jobtracker
|
|
"""
|
|
|
|
cluster_template = """
|
|
heat_template_version: 2013-05-23
|
|
description: Sahara Cluster Template
|
|
resources:
|
|
cluster-template:
|
|
type: OS::Sahara::ClusterTemplate
|
|
properties:
|
|
name: test-cluster-template
|
|
plugin_name: vanilla
|
|
hadoop_version: 2.3.0
|
|
neutron_management_network: some_network
|
|
"""
|
|
|
|
|
|
class FakeNodeGroupTemplate(object):
|
|
def __init__(self):
|
|
self.id = "some_ng_id"
|
|
self.name = "test-cluster-template"
|
|
|
|
|
|
class FakeClusterTemplate(object):
|
|
def __init__(self):
|
|
self.id = "some_ct_id"
|
|
self.name = "node-group-template"
|
|
|
|
|
|
class SaharaNodeGroupTemplateTest(common.HeatTestCase):
|
|
def setUp(self):
|
|
super(SaharaNodeGroupTemplateTest, self).setUp()
|
|
self.patchobject(st.constraints.CustomConstraint,
|
|
'_is_valid').return_value = True
|
|
self.patchobject(nova.NovaClientPlugin, 'get_flavor_id'
|
|
).return_value = 'someflavorid'
|
|
self.patchobject(neutron.NeutronClientPlugin, '_create')
|
|
self.patchobject(neutron.NeutronClientPlugin, 'find_neutron_resource'
|
|
).return_value = 'some_pool_id'
|
|
sahara_mock = mock.MagicMock()
|
|
self.ngt_mgr = sahara_mock.node_group_templates
|
|
self.patchobject(sahara.SaharaClientPlugin,
|
|
'_create').return_value = sahara_mock
|
|
self.fake_ngt = FakeNodeGroupTemplate()
|
|
|
|
self.t = template_format.parse(node_group_template)
|
|
|
|
def _init_ngt(self, template):
|
|
stack = utils.parse_stack(template)
|
|
return stack['node-group']
|
|
|
|
def test_ngt_resource_mapping(self):
|
|
ngt = self._init_ngt(self.t)
|
|
mapping = st.resource_mapping()
|
|
self.assertEqual(st.SaharaNodeGroupTemplate,
|
|
mapping['OS::Sahara::NodeGroupTemplate'])
|
|
self.assertIsInstance(ngt,
|
|
st.SaharaNodeGroupTemplate)
|
|
|
|
def _create_ngt(self, template):
|
|
ngt = self._init_ngt(template)
|
|
self.ngt_mgr.create.return_value = self.fake_ngt
|
|
scheduler.TaskRunner(ngt.create)()
|
|
self.assertEqual((ngt.CREATE, ngt.COMPLETE), ngt.state)
|
|
self.assertEqual(self.fake_ngt.id, ngt.resource_id)
|
|
return ngt
|
|
|
|
def test_ngt_create(self):
|
|
self._create_ngt(self.t)
|
|
expected_args = ('node-group-template', 'vanilla',
|
|
'2.3.0', 'someflavorid')
|
|
expected_kwargs = {'description': "",
|
|
'volumes_per_node': None,
|
|
'volumes_size': None,
|
|
'volume_type': None,
|
|
'security_groups': None,
|
|
'auto_security_group': None,
|
|
'availability_zone': None,
|
|
'volumes_availability_zone': None,
|
|
'node_processes': ['namenode', 'jobtracker'],
|
|
'floating_ip_pool': 'some_pool_id',
|
|
'node_configs': None,
|
|
}
|
|
self.ngt_mgr.create.assert_called_once_with(*expected_args,
|
|
**expected_kwargs)
|
|
|
|
def test_ngt_delete(self):
|
|
ngt = self._create_ngt(self.t)
|
|
scheduler.TaskRunner(ngt.delete)()
|
|
self.ngt_mgr.delete.assert_called_once_with(self.fake_ngt.id)
|
|
self.assertEqual((ngt.DELETE, ngt.COMPLETE), ngt.state)
|
|
|
|
def test_ngt_delete_ignores_not_found(self):
|
|
ngt = self._create_ngt(self.t)
|
|
self.ngt_mgr.delete.side_effect = sahara.sahara_base.APIException(
|
|
error_code=404)
|
|
scheduler.TaskRunner(ngt.delete)()
|
|
self.ngt_mgr.delete.assert_called_once_with(self.fake_ngt.id)
|
|
|
|
def test_ngt_delete_fails(self):
|
|
ngt = self._create_ngt(self.t)
|
|
self.ngt_mgr.delete.side_effect = sahara.sahara_base.APIException()
|
|
delete_task = scheduler.TaskRunner(ngt.delete)
|
|
ex = self.assertRaises(exception.ResourceFailure, delete_task)
|
|
expected = "APIException: None"
|
|
self.assertEqual(expected, six.text_type(ex))
|
|
self.ngt_mgr.delete.assert_called_once_with(self.fake_ngt.id)
|
|
|
|
def test_validate_no_floatingippool_on_neutron_fails(self):
|
|
self.t['resources']['node-group']['properties'].pop('floating_ip_pool')
|
|
ngt = self._init_ngt(self.t)
|
|
self.patchobject(ngt, 'is_using_neutron').return_value = True
|
|
ex = self.assertRaises(exception.StackValidationFailed, ngt.validate)
|
|
self.assertEqual('floating_ip_pool must be provided.',
|
|
six.text_type(ex))
|
|
|
|
|
|
class SaharaClusterTemplateTest(common.HeatTestCase):
|
|
def setUp(self):
|
|
super(SaharaClusterTemplateTest, self).setUp()
|
|
self.patchobject(st.constraints.CustomConstraint, '_is_valid'
|
|
).return_value = True
|
|
self.patchobject(neutron.NeutronClientPlugin, '_create')
|
|
self.patchobject(neutron.NeutronClientPlugin, 'find_neutron_resource'
|
|
).return_value = 'some_network_id'
|
|
sahara_mock = mock.MagicMock()
|
|
self.ct_mgr = sahara_mock.cluster_templates
|
|
self.patchobject(sahara.SaharaClientPlugin,
|
|
'_create').return_value = sahara_mock
|
|
self.fake_ct = FakeClusterTemplate()
|
|
|
|
self.t = template_format.parse(cluster_template)
|
|
|
|
def _init_ct(self, template):
|
|
stack = utils.parse_stack(template)
|
|
return stack['cluster-template']
|
|
|
|
def test_ct_resource_mapping(self):
|
|
ct = self._init_ct(self.t)
|
|
mapping = st.resource_mapping()
|
|
self.assertEqual(st.SaharaClusterTemplate,
|
|
mapping['OS::Sahara::ClusterTemplate'])
|
|
self.assertIsInstance(ct,
|
|
st.SaharaClusterTemplate)
|
|
|
|
def _create_ct(self, template):
|
|
ct = self._init_ct(template)
|
|
self.ct_mgr.create.return_value = self.fake_ct
|
|
scheduler.TaskRunner(ct.create)()
|
|
self.assertEqual((ct.CREATE, ct.COMPLETE), ct.state)
|
|
self.assertEqual(self.fake_ct.id, ct.resource_id)
|
|
return ct
|
|
|
|
def test_ct_create(self):
|
|
self._create_ct(self.t)
|
|
expected_args = ('test-cluster-template', 'vanilla',
|
|
'2.3.0')
|
|
expected_kwargs = {'description': '',
|
|
'default_image_id': None,
|
|
'net_id': 'some_network_id',
|
|
'anti_affinity': None,
|
|
'node_groups': None,
|
|
'cluster_configs': None
|
|
}
|
|
self.ct_mgr.create.assert_called_once_with(*expected_args,
|
|
**expected_kwargs)
|
|
|
|
def test_ct_delete(self):
|
|
ct = self._create_ct(self.t)
|
|
scheduler.TaskRunner(ct.delete)()
|
|
self.ct_mgr.delete.assert_called_once_with(self.fake_ct.id)
|
|
self.assertEqual((ct.DELETE, ct.COMPLETE), ct.state)
|
|
|
|
def test_ngt_delete_ignores_not_found(self):
|
|
ct = self._create_ct(self.t)
|
|
self.ct_mgr.delete.side_effect = sahara.sahara_base.APIException(
|
|
error_code=404)
|
|
scheduler.TaskRunner(ct.delete)()
|
|
self.ct_mgr.delete.assert_called_once_with(self.fake_ct.id)
|
|
|
|
def test_ngt_delete_fails(self):
|
|
ct = self._create_ct(self.t)
|
|
self.ct_mgr.delete.side_effect = sahara.sahara_base.APIException()
|
|
delete_task = scheduler.TaskRunner(ct.delete)
|
|
ex = self.assertRaises(exception.ResourceFailure, delete_task)
|
|
expected = "APIException: None"
|
|
self.assertEqual(expected, six.text_type(ex))
|
|
self.ct_mgr.delete.assert_called_once_with(self.fake_ct.id)
|
|
|
|
def test_ct_validate_no_network_on_neutron_fails(self):
|
|
self.t['resources']['cluster-template']['properties'].pop(
|
|
'neutron_management_network')
|
|
ct = self._init_ct(self.t)
|
|
self.patchobject(ct, 'is_using_neutron', return_value=True)
|
|
ex = self.assertRaises(exception.StackValidationFailed,
|
|
ct.validate)
|
|
self.assertEqual("neutron_management_network must be provided",
|
|
six.text_type(ex))
|