From: JUN JIE NAN <nanjj@cn.ibm.com>
Date: Thu, 1 Aug 2013 03:38:34 +0000 (+0800)
Subject: Rename: VALUES to ALLOWED_VALUES, PATTERN to ALLOWED_PATTERN
X-Git-Tag: 2014.1~275^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=58702cfb01b2b73dad52103f0d00ae69865e974f;p=openstack-build%2Fheat-build.git

Rename: VALUES to ALLOWED_VALUES, PATTERN to ALLOWED_PATTERN

Rename VALUES to ALLOWED_VALUES, PATTERN to ALLOWED_PATTERN in
parameters and modify related references in other modules

Implements blueprint hot-parameters

Change-Id: Iad018f6a9fc1166aa2c5d94720faf997dc7e98a3
---

diff --git a/heat/engine/parameters.py b/heat/engine/parameters.py
index e40dac27..be3cba32 100644
--- a/heat/engine/parameters.py
+++ b/heat/engine/parameters.py
@@ -21,7 +21,7 @@ from heat.common import exception
 from heat.engine import template
 
 PARAMETER_KEYS = (
-    TYPE, DEFAULT, NO_ECHO, VALUES, PATTERN,
+    TYPE, DEFAULT, NO_ECHO, ALLOWED_VALUES, ALLOWED_PATTERN,
     MAX_LENGTH, MIN_LENGTH, MAX_VALUE, MIN_VALUE,
     DESCRIPTION, CONSTRAINT_DESCRIPTION
 ) = (
@@ -86,10 +86,10 @@ class Parameter(object):
         return '%s %s' % (self.name, self._constraint_error or message)
 
     def _validate(self, value):
-        if VALUES in self.schema:
-            allowed = list(self.schema[VALUES])
+        if ALLOWED_VALUES in self.schema:
+            allowed = list(self.schema[ALLOWED_VALUES])
             if value not in allowed:
-                message = '%s not in %s %s' % (value, VALUES, allowed)
+                message = '%s not in %s %s' % (value, ALLOWED_VALUES, allowed)
                 raise ValueError(self._error_msg(message))
 
     def value(self):
@@ -186,12 +186,12 @@ class StringParam(Parameter):
                                                             min_length)
                 raise ValueError(self._error_msg(message))
 
-        if PATTERN in self.schema:
-            pattern = self.schema[PATTERN]
+        if ALLOWED_PATTERN in self.schema:
+            pattern = self.schema[ALLOWED_PATTERN]
             match = re.match(pattern, value)
             if match is None or match.end() != length:
                 message = '"%s" does not match %s "%s"' % (value,
-                                                           PATTERN,
+                                                           ALLOWED_PATTERN,
                                                            pattern)
                 raise ValueError(self._error_msg(message))
 
@@ -252,12 +252,12 @@ class JsonParam(Parameter, collections.Mapping):
                            % (my_len, MIN_LENGTH, min_length))
                 raise ValueError(self._error_msg(message))
         # check valid keys
-        if VALUES in self.schema:
-            allowed = list(self.schema[VALUES])
+        if ALLOWED_VALUES in self.schema:
+            allowed = list(self.schema[ALLOWED_VALUES])
             bad_keys = [k for k in self.parsed if k not in allowed]
             if bad_keys:
                 message = ('keys %s are not in %s %s'
-                           % (bad_keys, VALUES, allowed))
+                           % (bad_keys, ALLOWED_VALUES, allowed))
                 raise ValueError(self._error_msg(message))
 
     def __getitem__(self, key):
@@ -294,12 +294,12 @@ class Parameters(collections.Mapping):
                 yield Parameter(PARAM_REGION,
                                 {TYPE: STRING,
                                  DEFAULT: 'ap-southeast-1',
-                                 VALUES: ['us-east-1',
-                                          'us-west-1', 'us-west-2',
-                                          'sa-east-1',
-                                          'eu-west-1',
-                                          'ap-southeast-1',
-                                          'ap-northeast-1']})
+                                 ALLOWED_VALUES: ['us-east-1',
+                                                  'us-west-1', 'us-west-2',
+                                                  'sa-east-1',
+                                                  'eu-west-1',
+                                                  'ap-southeast-1',
+                                                  'ap-northeast-1']})
 
             for name, schema in tmpl[template.PARAMETERS].iteritems():
                 yield Parameter(name, schema, user_params.get(name),
diff --git a/heat/engine/properties.py b/heat/engine/properties.py
index b17db7d6..efad495b 100644
--- a/heat/engine/properties.py
+++ b/heat/engine/properties.py
@@ -21,7 +21,7 @@ from heat.engine import parameters
 
 SCHEMA_KEYS = (
     REQUIRED, IMPLEMENTED, DEFAULT, TYPE, SCHEMA,
-    PATTERN, MIN_VALUE, MAX_VALUE, VALUES,
+    ALLOWED_PATTERN, MIN_VALUE, MAX_VALUE, ALLOWED_VALUES,
     MIN_LENGTH, MAX_LENGTH,
 ) = (
     'Required', 'Implemented', 'Default', 'Type', 'Schema',
@@ -75,8 +75,8 @@ class Property(object):
         return self.schema[TYPE]
 
     def _check_allowed(self, value):
-        if VALUES in self.schema:
-            allowed = list(self.schema[VALUES])
+        if ALLOWED_VALUES in self.schema:
+            allowed = list(self.schema[ALLOWED_VALUES])
             if value not in allowed:
                 raise ValueError('"%s" is not an allowed value %s' %
                                  (value, str(allowed)))
@@ -105,10 +105,10 @@ class Property(object):
             ret.update({DEFAULT: param[parameters.DEFAULT]})
         else:
             ret.update({REQUIRED: "true"})
-        if parameters.VALUES in param:
-            ret.update({VALUES: param[parameters.VALUES]})
-        if parameters.PATTERN in param:
-            ret.update({PATTERN: param[parameters.PATTERN]})
+        if parameters.ALLOWED_VALUES in param:
+            ret.update({ALLOWED_VALUES: param[parameters.ALLOWED_VALUES]})
+        if parameters.ALLOWED_PATTERN in param:
+            ret.update({ALLOWED_PATTERN: param[parameters.ALLOWED_PATTERN]})
         if parameters.MAX_LENGTH in param:
             ret.update({MAX_LENGTH: param[parameters.MAX_LENGTH]})
         if parameters.MIN_LENGTH in param:
@@ -149,8 +149,8 @@ class Property(object):
 
         self._check_allowed(value)
 
-        if PATTERN in self.schema:
-            pattern = self.schema[PATTERN]
+        if ALLOWED_PATTERN in self.schema:
+            pattern = self.schema[ALLOWED_PATTERN]
             match = re.match(pattern, value)
             if match is None or match.end() != len(value):
                 raise ValueError('"%s" does not match pattern "%s"' %