Synchronise the openstack bugs

When run unittests through tox, some test cases are always error,
the errors are already done in openstack community, so it's
necessary to synchronise the fixes.

Change-Id: Ib29078e6cc138a474e89c6a2cc90ad7a1db1bb46
JIRA: PARSER-63
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>

1 files changed, 122 insertions, 13 deletions

diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_datatypes.py b/tosca2heat/tosca-parser/toscaparser/tests/test_datatypes.py
index 0e613b2..0a6cfe0 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/test_datatypes.py
+++ b/tosca2heat/tosca-parser/toscaparser/tests/test_datatypes.py
@@ -66,16 +66,21 @@ class DataTypeTest(TestCase):
 
     tosca.my.datatypes.TestLab:
       properties:
-        temperature:
+        humidity:
+          type: range
+          required: false
+          constraints:
+            - in_range: [-256, INFINITY]
+        temperature1:
           type: range
           required: false
           constraints:
             - in_range: [-256, UNBOUNDED]
-        humidity:
+        temperature2:
           type: range
           required: false
           constraints:
-            - in_range: [-256, INFINITY]
+            - in_range: [UNBOUNDED, 256]
     '''
     custom_type_def = yamlparser.simple_parse(custom_type_schema)
 
@@ -84,15 +89,6 @@ class DataTypeTest(TestCase):
         value = yamlparser.simple_parse(value_snippet)
         self.assertEqual(value, {})
 
-    # TODO(Matt) - opened as bug 1555300
-    # Need a test for PortSpec normative data type
-    # that tests the spec. requirement: "A valid PortSpec
-    # must have at least one of the following properties:
-    # target, target_range, source or source_range."
-    # TODO(Matt) - opened as bug 1555310
-    # test PortSpec value for source and target
-    # against the source_range and target_range
-    # when specified.
     def test_built_in_datatype(self):
         value_snippet = '''
         private_network:
@@ -140,6 +136,31 @@ class DataTypeTest(TestCase):
         data = DataEntity('PortInfo', value.get('ethernet_port'))
         self.assertIsNotNone(data.validate())
 
+    # Test normative PortSpec datatype's additional requirements
+    # TODO(Matt) - opened as bug 1555300
+    # Need a test for PortSpec normative data type
+    # that tests the spec. requirement: "A valid PortSpec
+    # must have at least one of the following properties:
+    # target, target_range, source or source_range."
+    # TODO(Matt) - opened as bug 1555310
+    # test PortSpec value for source and target
+    # against the source_range and target_range
+    # when specified.
+    def test_port_spec_addl_reqs(self):
+        value_snippet = '''
+        test_port:
+          protocol: tcp
+          target: 65535
+          target_range: [ 1, 65535 ]
+          source: 1
+          source_range: [ 1, 65535 ]
+
+        '''
+        value = yamlparser.simple_parse(value_snippet)
+        data = DataEntity('tosca.datatypes.network.PortSpec',
+                          value.get('test_port'))
+        self.assertIsNotNone(data.validate())
+
     def test_built_in_datatype_without_properties(self):
         value_snippet = '''
         2
@@ -365,6 +386,7 @@ class DataTypeTest(TestCase):
         value_snippet = '''
         user_port:
           protocol: tcp
+          target: 1
           target_range: [20000]
         '''
         value = yamlparser.simple_parse(value_snippet)
@@ -377,6 +399,7 @@ class DataTypeTest(TestCase):
         value_snippet = '''
         user_port:
           protocol: tcp
+          target: 1
           target_range: [20000, 3000]
         '''
         value = yamlparser.simple_parse(value_snippet)
@@ -400,9 +423,95 @@ class DataTypeTest(TestCase):
 
     def test_range_unbounded(self):
         value_snippet = '''
-        temperature: [-100, 999999]
+        humidity: [-100, 100]
+        '''
+        value = yamlparser.simple_parse(value_snippet)
+        data = DataEntity('tosca.my.datatypes.TestLab',
+                          value, DataTypeTest.custom_type_def)
+        err = self.assertRaises(exception.InvalidSchemaError,
+                                lambda: data.validate())
+        self.assertEqual(_('The property "in_range" expects comparable values.'
+                           ),
+                         err.__str__())
+
+    def test_invalid_ranges_against_constraints(self):
+        # The TestLab range type has min=-256, max=UNBOUNDED
+        value_snippet = '''
+        temperature1: [-257, 999999]
+        '''
+        value = yamlparser.simple_parse(value_snippet)
+        data = DataEntity('tosca.my.datatypes.TestLab', value,
+                          DataTypeTest.custom_type_def)
+        err = self.assertRaises(exception.ValidationError, data.validate)
+        self.assertEqual(_('The value "-257" of property "temperature1" is '
+                           'out of range "(min:-256, max:UNBOUNDED)".'),
+                         err.__str__())
+
+        value_snippet = '''
+        temperature2: [-999999, 257]
+        '''
+        value = yamlparser.simple_parse(value_snippet)
+        data = DataEntity('tosca.my.datatypes.TestLab', value,
+                          DataTypeTest.custom_type_def)
+        err = self.assertRaises(exception.ValidationError, data.validate)
+        self.assertEqual(_('The value "257" of property "temperature2" is '
+                           'out of range "(min:UNBOUNDED, max:256)".'),
+                         err.__str__())
+
+    def test_valid_ranges_against_constraints(self):
+
+        # The TestLab range type has max=UNBOUNDED
+        value_snippet = '''
+        temperature1: [-255, 999999]
         '''
         value = yamlparser.simple_parse(value_snippet)
         data = DataEntity('tosca.my.datatypes.TestLab', value,
                           DataTypeTest.custom_type_def)
         self.assertIsNotNone(data.validate())
+
+        # The TestLab range type has min=UNBOUNDED
+        value_snippet = '''
+        temperature2: [-999999, 255]
+        '''
+        value = yamlparser.simple_parse(value_snippet)
+        data = DataEntity('tosca.my.datatypes.TestLab', value,
+                          DataTypeTest.custom_type_def)
+        self.assertIsNotNone(data.validate())
+
+    def test_incorrect_field_in_datatype(self):
+        tpl_snippet = '''
+        tosca_definitions_version: tosca_simple_yaml_1_0
+        topology_template:
+          node_templates:
+            server:
+              type: tosca.nodes.Compute
+
+            webserver:
+              type: tosca.nodes.WebServer
+              properties:
+                admin_credential:
+                  user: username
+                  token: some_pass
+                  some_field: value
+              requirements:
+                - host: server
+        '''
+        tpl = yamlparser.simple_parse(tpl_snippet)
+        err = self.assertRaises(exception.ValidationError, ToscaTemplate,
+                                None, None, None, tpl)
+        self.assertIn(_('The pre-parsed input failed validation with the '
+                        'following error(s): \n\n\tUnknownFieldError: Data '
+                        'value of type "tosca.datatypes.Credential" contains'
+                        ' unknown field "some_field". Refer to the definition'
+                        ' to verify valid values'), err.__str__())
+
+    def test_functions_datatype(self):
+        value_snippet = '''
+        admin_credential:
+          user: username
+          token: { get_input: password }
+        '''
+        value = yamlparser.simple_parse(value_snippet)
+        data = DataEntity('tosca.datatypes.Credential',
+                          value.get('admin_credential'))
+        self.assertIsNotNone(data.validate())