openstack/heat
Code Issues Proposed changes

Merge "Fix usage of environment section constants"

Browse Source
This commit is contained in:
Jenkins 2014-09-02 01:08:09 +00:00 committed by Gerrit Code Review
commit 12b3bd4360
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
heat/engine/environment.py
View File

@ -18,7 +18,7 @@ import os.path
from oslo.config import cfg
import six
from heat.common import environment_format
from heat.common import environment_format as env_fmt
from heat.common import exception
from heat.openstack.common.gettextutils import _
from heat.openstack.common import log
@ -333,10 +333,6 @@ class ResourceRegistry(object):
if is_resource(name) and status_matches(cls)]
SECTIONS = (PARAMETERS, RESOURCE_REGISTRY) = \
('parameters', 'resource_registry')
class Environment(object):
def __init__(self, env=None, user_env=True):
@ -356,23 +352,23 @@ class Environment(object):
global_registry = None
self.registry = ResourceRegistry(global_registry)
self.registry.load(env.get(RESOURCE_REGISTRY, {}))
self.registry.load(env.get(env_fmt.RESOURCE_REGISTRY, {}))
if 'parameters' in env:
self.params = env['parameters']
if env_fmt.PARAMETERS in env:
self.params = env[env_fmt.PARAMETERS]
else:
self.params = dict((k, v) for (k, v) in six.iteritems(env)
if k != RESOURCE_REGISTRY)
if k != env_fmt.RESOURCE_REGISTRY)
self.constraints = {}
def load(self, env_snippet):
self.registry.load(env_snippet.get(RESOURCE_REGISTRY, {}))
self.params.update(env_snippet.get('parameters', {}))
self.registry.load(env_snippet.get(env_fmt.RESOURCE_REGISTRY, {}))
self.params.update(env_snippet.get(env_fmt.PARAMETERS, {}))
def user_env_as_dict(self):
"""Get the environment as a dict, ready for storing in the db."""
return {RESOURCE_REGISTRY: self.registry.as_dict(),
PARAMETERS: self.params}
return {env_fmt.RESOURCE_REGISTRY: self.registry.as_dict(),
env_fmt.PARAMETERS: self.params}
def register_class(self, resource_type, resource_class):
self.registry.register_class(resource_type, resource_class)
@ -411,8 +407,8 @@ def read_global_environment(env, env_dir=None):
try:
with open(file_path) as env_fd:
LOG.info(_('Loading %s') % file_path)
env_body = environment_format.parse(env_fd.read())
environment_format.default_for_missing(env_body)
env_body = env_fmt.parse(env_fd.read())
env_fmt.default_for_missing(env_body)
env.load(env_body)
except ValueError as vex:
LOG.error(_('Failed to parse %(file_path)s') % {

6
heat/engine/resources/autoscaling.py
View File

@ -16,11 +16,11 @@ import math
import six
from heat.common import environment_format
from heat.common import exception
from heat.common import timeutils as iso8601utils
from heat.engine import attributes
from heat.engine import constraints
from heat.engine import environment
from heat.engine import function
from heat.engine.notification import autoscaling as notification
from heat.engine import properties
@ -210,8 +210,8 @@ class InstanceGroup(stack_resource.StackResource):
def _environment(self):
"""Return the environment for the nested stack."""
return {
environment.PARAMETERS: {},
environment.RESOURCE_REGISTRY: {
environment_format.PARAMETERS: {},
environment_format.RESOURCE_REGISTRY: {
SCALED_RESOURCE_TYPE: 'AWS::EC2::Instance',
},
}

7
heat/engine/stack_resource.py
View File

@ -13,6 +13,7 @@
from oslo.config import cfg
from heat.common import environment_format
from heat.common import exception
from heat.engine import attributes
from heat.engine import environment
@ -138,10 +139,10 @@ class StackResource(resource.Resource):
"""
nested_env = environment.Environment()
nested_env.registry = self.stack.env.registry
user_env = {environment.PARAMETERS: {}}
user_env = {environment_format.PARAMETERS: {}}
if user_params is not None:
if environment.PARAMETERS not in user_params:
user_env[environment.PARAMETERS] = user_params
if environment_format.PARAMETERS not in user_params:
user_env[environment_format.PARAMETERS] = user_params
else:
user_env.update(user_params)
nested_env.load(user_env)