openstack
/
heat
Code Issues Proposed changes

Merge "Add RESOLVE translation for some sahara resources"

This commit is contained in:
Jenkins 2016-04-22 14:51:18 +00:00 committed by Gerrit Code Review
parent 5672c4649e 19d1c9a220
commit c6533c5bf3
3 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
heat/engine/resources/openstack/sahara/cluster.py
View File

@ -180,12 +180,36 @@ class SaharaCluster(resource.Resource):
entity = 'clusters'
def translation_rules(self, props):
return [translation.TranslationRule(
props,
translation.TranslationRule.REPLACE,
[self.IMAGE_ID],
value_path=[self.IMAGE]
)]
rules = [
translation.TranslationRule(
props,
translation.TranslationRule.REPLACE,
[self.IMAGE_ID],
value_path=[self.IMAGE]),
translation.TranslationRule(
props,
translation.TranslationRule.RESOLVE,
[self.IMAGE_ID],
client_plugin=self.client_plugin('glance'),
finder='find_image_by_name_or_id')]
if self.is_using_neutron():
rules.extend([
translation.TranslationRule(
props,
translation.TranslationRule.RESOLVE,
[self.MANAGEMENT_NETWORK],
client_plugin=self.client_plugin('neutron'),
finder='find_resourceid_by_name_or_id',
entity='network')])
else:
rules.extend([
translation.TranslationRule(
props,
translation.TranslationRule.RESOLVE,
[self.MANAGEMENT_NETWORK],
client_plugin=self.client_plugin('nova'),
finder='get_nova_network_id')])
return rules
def _cluster_name(self):
name = self.properties[self.NAME]
@ -198,10 +222,6 @@ class SaharaCluster(resource.Resource):
hadoop_version = self.properties[self.HADOOP_VERSION]
cluster_template_id = self.properties[self.CLUSTER_TEMPLATE_ID]
image_id = self.properties[self.IMAGE_ID]
if image_id:
image_id = self.client_plugin(
'glance').find_image_by_name_or_id(image_id)
# check that image is provided in case when
# cluster template is missing one
cluster_template = self.client().cluster_templates.get(
@ -214,14 +234,6 @@ class SaharaCluster(resource.Resource):
key_name = self.properties[self.KEY_NAME]
net_id = self.properties[self.MANAGEMENT_NETWORK]
if net_id:
if self.is_using_neutron():
net_id = self.client_plugin(
'neutron').find_resourceid_by_name_or_id('network',
net_id)
else:
net_id = self.client_plugin('nova').get_nova_network_id(
net_id)
use_autoconfig = self.properties[self.USE_AUTOCONFIG]
shares = self.properties[self.SHARES]

16
heat/engine/resources/openstack/sahara/image.py
View File

@ -17,6 +17,7 @@ from heat.engine import constraints
from heat.engine import properties
from heat.engine import resource
from heat.engine import support
from heat.engine import translation
class SaharaImageRegistry(resource.Resource):
@ -66,15 +67,22 @@ class SaharaImageRegistry(resource.Resource):
)
}
def translation_rules(self, props):
return [
translation.TranslationRule(
props,
translation.TranslationRule.RESOLVE,
[self.IMAGE],
client_plugin=self.client_plugin('glance'),
finder='find_image_by_name_or_id')
]
default_client_name = 'sahara'
entity = 'images'
def handle_create(self):
self.resource_id_set(self.client_plugin(
'glance').find_image_by_name_or_id(
self.properties[self.IMAGE]))
self.resource_id_set(self.properties[self.IMAGE])
self.client().images.update_image(
self.resource_id,
self.properties[self.USERNAME],

5
heat/tests/openstack/sahara/test_cluster.py
View File

@ -199,5 +199,6 @@ resources:
neutron_management_network: some_network
'''
ct = self._create_cluster(template_format.parse(tmpl))
self.assertEqual('some_image', ct.properties.get('default_image_id'))
self.assertIsNone(ct.properties.get('image'))
self.assertEqual('some_image_id',
ct.properties.get('default_image_id'))
self.assertIsNone(ct.properties.get('image_id'))