0638030671
Currently, we load all the resources from the database to resolve template functions of dependent resources. In convergence, because every worker will load it's own stack object, loading all the resources for every resource lifecycle operation will be inefficient. This patch allows creating lightweight stacks using a cache provided which will never query the database and only depend on the template and the cache provided. Function resolutions will now happen by querying the values in the cache provided if it exists else None is returned. The resultant lightweight stack will effectively be the stack attributes loaded from the database and it's raw template with the dependent resource's functions resolved which will serve as the input for individual resource objects that will be worked upon. blueprint convergence-lightweight-stack Change-Id: I6dbaa7ee4e9d534c31823b4812efcb387c695a22
222 lines
9.4 KiB
Python
222 lines
9.4 KiB
Python
#
|
|
# 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 neutronclient.common import exceptions as qe
|
|
from neutronclient.v2_0 import client as neutronclient
|
|
import six
|
|
|
|
from heat.common import exception
|
|
from heat.engine.clients.os import neutron
|
|
from heat.engine.hot import functions
|
|
from heat.engine import properties
|
|
from heat.engine import resource
|
|
from heat.engine.resources.openstack.neutron import net
|
|
from heat.engine.resources.openstack.neutron import neutron as nr
|
|
from heat.engine.resources.openstack.neutron import subnet
|
|
from heat.engine import rsrc_defn
|
|
from heat.tests import common
|
|
from heat.tests import utils
|
|
|
|
|
|
class NeutronTest(common.HeatTestCase):
|
|
|
|
def test_validate_properties(self):
|
|
vs = {'router:external': True}
|
|
data = {'admin_state_up': False,
|
|
'value_specs': vs}
|
|
p = properties.Properties(net.Net.properties_schema, data)
|
|
self.assertIsNone(nr.NeutronResource.validate_properties(p))
|
|
|
|
vs['foo'] = '1234'
|
|
self.assertIsNone(nr.NeutronResource.validate_properties(p))
|
|
vs.pop('foo')
|
|
|
|
banned_keys = {'shared': True,
|
|
'name': 'foo',
|
|
'tenant_id': '1234'}
|
|
for key, val in six.iteritems(banned_keys):
|
|
vs.update({key: val})
|
|
msg = '%s not allowed in value_specs' % key
|
|
self.assertEqual(msg, nr.NeutronResource.validate_properties(p))
|
|
vs.pop(key)
|
|
|
|
def test_validate_depr_properties_required_both(self):
|
|
data = {'network_id': '1234',
|
|
'network': 'abc'}
|
|
p = properties.Properties(subnet.Subnet.properties_schema, data)
|
|
self.assertRaises(exception.ResourcePropertyConflict,
|
|
nr.NeutronResource._validate_depr_property_required,
|
|
p, 'network', 'network_id')
|
|
|
|
def test_validate_depr_properties_required_neither(self):
|
|
data = {}
|
|
p = properties.Properties(subnet.Subnet.properties_schema, data)
|
|
self.assertRaises(exception.PropertyUnspecifiedError,
|
|
nr.NeutronResource._validate_depr_property_required,
|
|
p, 'network', 'network_id')
|
|
|
|
def test_validate_depr_properties_required_with_refs(self):
|
|
funct = functions.GetParam(mock.Mock(),
|
|
'get_param', 'private_subnet_id')
|
|
data = {'network_id': funct}
|
|
p = properties.Properties(subnet.Subnet.properties_schema, data,
|
|
resolver=lambda d: None)
|
|
# no assert, as we are looking for no exception.
|
|
nr.NeutronResource._validate_depr_property_required(
|
|
p, 'network', 'network_id')
|
|
|
|
def test_prepare_properties(self):
|
|
data = {'admin_state_up': False,
|
|
'value_specs': {'router:external': True}}
|
|
p = properties.Properties(net.Net.properties_schema, data)
|
|
props = nr.NeutronResource.prepare_properties(p, 'resource_name')
|
|
self.assertEqual({'name': 'resource_name',
|
|
'router:external': True,
|
|
'admin_state_up': False,
|
|
'shared': False}, props)
|
|
|
|
def test_is_built(self):
|
|
self.assertTrue(nr.NeutronResource.is_built({'status': 'ACTIVE'}))
|
|
self.assertTrue(nr.NeutronResource.is_built({'status': 'DOWN'}))
|
|
self.assertFalse(nr.NeutronResource.is_built({'status': 'BUILD'}))
|
|
e = self.assertRaises(
|
|
resource.ResourceInError,
|
|
nr.NeutronResource.is_built, {'status': 'ERROR'})
|
|
self.assertEqual(
|
|
'Went to status ERROR due to "Unknown"',
|
|
six.text_type(e))
|
|
e = self.assertRaises(
|
|
resource.ResourceUnknownStatus,
|
|
nr.NeutronResource.is_built, {'status': 'FROBULATING'})
|
|
self.assertEqual('Resource is not built - Unknown status '
|
|
'FROBULATING due to "Unknown"',
|
|
six.text_type(e))
|
|
|
|
def test_resolve_attribute(self):
|
|
class SomeNeutronResource(nr.NeutronResource):
|
|
properties_schema = {}
|
|
|
|
tmpl = rsrc_defn.ResourceDefinition('test_res', 'Foo')
|
|
stack = mock.MagicMock()
|
|
stack.has_cache_data = mock.Mock(return_value=False)
|
|
res = SomeNeutronResource('aresource', tmpl, stack)
|
|
|
|
mock_show_resource = mock.MagicMock()
|
|
mock_show_resource.side_effect = [{'attr1': 'val1', 'attr2': 'val2'},
|
|
{'attr1': 'val1', 'attr2': 'val2'},
|
|
{'attr1': 'val1', 'attr2': 'val2'},
|
|
qe.NotFound,
|
|
qe.NeutronClientException]
|
|
res._show_resource = mock_show_resource
|
|
nclientplugin = neutron.NeutronClientPlugin(mock.MagicMock())
|
|
res.client_plugin = mock.Mock(return_value=nclientplugin)
|
|
|
|
self.assertEqual({'attr1': 'val1', 'attr2': 'val2'},
|
|
res._resolve_attribute('show'))
|
|
self.assertEqual('val2', res._resolve_attribute('attr2'))
|
|
self.assertRaises(KeyError, res._resolve_attribute, 'attr3')
|
|
self.assertIsNone(res._resolve_attribute('attr2'))
|
|
res.resource_id = None
|
|
self.assertIsNone(res._resolve_attribute('show'))
|
|
|
|
|
|
class GetSecGroupUuidTest(common.HeatTestCase):
|
|
|
|
scenarios = [
|
|
('with_uuid', dict(
|
|
secgroups=['b62c3079-6946-44f5-a67b-6b9091884d4f',
|
|
'9887157c-d092-40f5-b547-6361915fce7d'],
|
|
expected=['b62c3079-6946-44f5-a67b-6b9091884d4f',
|
|
'9887157c-d092-40f5-b547-6361915fce7d'],
|
|
error=False,
|
|
fake_group_list=None)),
|
|
('with_name', dict(
|
|
secgroups=['security_group_1'],
|
|
expected=['0389f747-7785-4757-b7bb-2ab07e4b09c3'],
|
|
error=False,
|
|
fake_group_list={
|
|
'security_groups': [
|
|
{
|
|
'tenant_id': 'dc4b074874244f7693dd65583733a758',
|
|
'id': '0389f747-7785-4757-b7bb-2ab07e4b09c3',
|
|
'name': 'security_group_1',
|
|
'security_group_rules': [],
|
|
'description': 'no protocol'
|
|
}
|
|
]
|
|
})),
|
|
('two_same_names_one_belongs_to_tenant', dict(
|
|
secgroups=['security_group_1'],
|
|
expected=['0389f747-7785-4757-b7bb-2ab07e4b09c3'],
|
|
error=False,
|
|
fake_group_list={
|
|
'security_groups': [
|
|
{
|
|
'tenant_id': 'dc4b074874244f7693dd65583733a758',
|
|
'id': '0389f747-7785-4757-b7bb-2ab07e4b09c3',
|
|
'name': 'security_group_1',
|
|
'security_group_rules': [],
|
|
'description': 'no protocol'
|
|
},
|
|
{
|
|
'tenant_id': '64395a8e5beb4930a18245f76a5b1570',
|
|
'id': '384ccd91-447c-4d83-832c-06974a7d3d05',
|
|
'name': 'security_group_1',
|
|
'security_group_rules': [],
|
|
'description': 'no protocol'
|
|
}
|
|
]
|
|
})),
|
|
('two_same_names_both_belongs_to_tenant', dict(
|
|
secgroups=['security_group_1'],
|
|
expected=['0389f747-7785-4757-b7bb-2ab07e4b09c3'],
|
|
error=True,
|
|
fake_group_list={
|
|
'security_groups': [
|
|
{
|
|
'tenant_id': 'dc4b074874244f7693dd65583733a758',
|
|
'id': '0389f747-7785-4757-b7bb-2ab07e4b09c3',
|
|
'name': 'security_group_1',
|
|
'security_group_rules': [],
|
|
'description': 'no protocol'
|
|
},
|
|
{
|
|
'tenant_id': 'dc4b074874244f7693dd65583733a758',
|
|
'id': '384ccd91-447c-4d83-832c-06974a7d3d05',
|
|
'name': 'security_group_1',
|
|
'security_group_rules': [],
|
|
'description': 'no protocol'
|
|
}
|
|
]
|
|
}))
|
|
]
|
|
|
|
def test_secgr(self):
|
|
ctx = utils.dummy_context(
|
|
tenant_id='dc4b074874244f7693dd65583733a758')
|
|
nclient = neutronclient.Client()
|
|
mock_list = self.patchobject(neutronclient.Client,
|
|
'list_security_groups')
|
|
mock_list.return_value = self.fake_group_list
|
|
|
|
if self.error:
|
|
self.assertRaises(exception.PhysicalResourceNameAmbiguity,
|
|
nr.NeutronResource.get_secgroup_uuids,
|
|
self.secgroups, nclient, ctx.tenant_id)
|
|
else:
|
|
self.assertEqual(
|
|
self.expected,
|
|
nr.NeutronResource.get_secgroup_uuids(self.secgroups, nclient,
|
|
ctx.tenant_id))
|