From: Zane Bitter <zbitter@redhat.com>
Date: Mon, 19 Aug 2013 18:51:45 +0000 (+0200)
Subject: Remove the Property.schema_from_param() method
X-Git-Tag: 2014.1~155^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6b8c2a15e85fe918ee681f9f687578bf1fc8810f;p=openstack-build%2Fheat-build.git

Remove the Property.schema_from_param() method

This is now unused.

Change-Id: I5da20effe72a791d6dd8e9cc99ec9e43dea2da07
---

diff --git a/heat/engine/properties.py b/heat/engine/properties.py
index ea6f12dd..e12f2b27 100644
--- a/heat/engine/properties.py
+++ b/heat/engine/properties.py
@@ -475,13 +475,6 @@ class AllowedPattern(Constraint):
 
 class Property(object):
 
-    __param_type_map = {
-        parameters.STRING: STRING,
-        parameters.NUMBER: NUMBER,
-        parameters.COMMA_DELIMITED_LIST: LIST,
-        parameters.JSON: MAP
-    }
-
     def __init__(self, schema, name=None):
         self.schema = Schema.from_legacy(schema)
         self.name = name
@@ -508,37 +501,6 @@ class Property(object):
         except ValueError:
             return float(value)
 
-    @staticmethod
-    def schema_from_param(param):
-        """
-        Convert the param specification to a property schema definition
-
-        :param param: parameter definition
-        :return: a property schema definition for param
-        """
-        if parameters.TYPE not in param:
-            raise ValueError("Parameter does not define a type for conversion")
-        ret = {
-            TYPE: Property.__param_type_map.get(param.get(parameters.TYPE))
-        }
-        if parameters.DEFAULT in param:
-            ret.update({DEFAULT: param[parameters.DEFAULT]})
-        else:
-            ret.update({REQUIRED: "true"})
-        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:
-            ret.update({MIN_LENGTH: param[parameters.MIN_LENGTH]})
-        if parameters.MAX_VALUE in param:
-            ret.update({MAX_VALUE: param[parameters.MAX_VALUE]})
-        if parameters.MIN_VALUE in param:
-            ret.update({MIN_VALUE: param[parameters.MIN_VALUE]})
-        return ret
-
     def _validate_integer(self, value):
         if value is None:
             value = self.has_default() and self.default() or 0
diff --git a/heat/tests/test_properties.py b/heat/tests/test_properties.py
index 33c98884..e39cd52b 100644
--- a/heat/tests/test_properties.py
+++ b/heat/tests/test_properties.py
@@ -942,26 +942,6 @@ class PropertyTest(testtools.TestCase):
         p = properties.Property({'Type': 'List', 'Schema': list_schema})
         self.assertRaises(TypeError, p.validate_data, [42, 'fish'])
 
-    def test_schema_from_param(self):
-        param = {
-            "Description": "WebServer EC2 instance type",
-            "Type": "String",
-            "Default": "m1.large",
-            "AllowedValues": ["t1.micro", "m1.small", "m1.large", "m1.xlarge",
-                              "m2.xlarge", "m2.2xlarge", "m2.4xlarge",
-                              "c1.medium", "c1.xlarge", "cc1.4xlarge"],
-            "ConstraintDescription": "must be a valid EC2 instance type."
-        }
-        expected = {
-            'Default': 'm1.large',
-            'Type': 'String',
-            'AllowedValues': ['t1.micro', 'm1.small', 'm1.large', 'm1.xlarge',
-                              'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge',
-                              'c1.medium', 'c1.xlarge', 'cc1.4xlarge']
-        }
-        self.assertEqual(expected,
-                         properties.Property.schema_from_param(param))
-
 
 class PropertiesTest(testtools.TestCase):
     def setUp(self):