Merge upstream

.gitignore

@@ -23,8 +23,10 @@ pip-log.txt
 
 # Unit test / coverage reports
 .coverage
+cover
 .tox
 nosetests.xml
+.stestr/
 .testrepository
 
 # Translations
@@ -53,4 +55,4 @@ ChangeLog
 *.iml
 
 # OSX
-.DS_Store
+.DS_Store

.gitreview

@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/tosca-parser.git

.stestr.conf

@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./toscaparser/tests/
+top_dir=./
+

.zuul.yaml

@@ -1,16 +1,7 @@
 - project:
     templates:
-      - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
-      - publish-openstack-docs-pti
       - check-requirements
-    check:
-      jobs:
-        - openstack-tox-lower-constraints
-    gate:
-      jobs:
-        - openstack-tox-lower-constraints
-    post:
-      jobs:
-        - openstack-tox-cover
+      - openstack-cover-jobs
+      - openstack-lower-constraints-jobs
+      - openstack-python3-wallaby-jobs
+      - publish-openstack-docs-pti

CONTRIBUTING.rst

@@ -1,16 +1,16 @@
 If you would like to contribute to the development of OpenStack,
 you must follow the steps in this page:
 
-   http://docs.openstack.org/infra/manual/developers.html
+   https://docs.openstack.org/infra/manual/developers.html
 
 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:
 
-   http://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
-Bugs should be filed on Launchpad, not GitHub:
+Bugs should be filed on Storyboard, not GitHub:
 
-   https://bugs.launchpad.net/tosca-parser
+   https://storyboard.openstack.org/#!/project/998

HACKING.rst

@@ -1,4 +1,4 @@
 tosca-parser Style Commandments
-===============================================
+===============================
 
-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
+Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/

README.rst

@@ -50,5 +50,5 @@ Project Info
 ------------
 
 * License: Apache License, Version 2.0
-* Source: http://git.openstack.org/cgit/openstack/tosca-parser/
+* Source: https://opendev.org/openstack/tosca-parser/
 

doc/requirements.txt

@@ -1,5 +1,5 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD

doc/source/conf.py

@@ -35,8 +35,12 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'tosca-parser'
-copyright = u'2013, OpenStack Foundation'
+project = 'tosca-parser'
+copyright = '2013, OpenStack Foundation'
+
+# openstackdocstheme options
+openstackdocs_repo_name = 'openstack/tosca-parser'
+openstackdocs_use_storyboard = True
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -46,7 +50,7 @@
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -62,8 +66,8 @@
 latex_documents = [
     ('index',
      '%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Foundation', 'manual'),
+     '%s Documentation' % project,
+     'OpenStack Foundation', 'manual'),
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.

lower-constraints.txt

@@ -1,31 +1,23 @@
 alabaster==0.7.10
 appdirs==1.3.0
-Babel==2.3.4
 cliff==2.8.0
 cmd2==0.8.0
 coverage==4.0
 docutils==0.11
 extras==1.0.0
 fixtures==3.0.0
-flake8==2.5.5
-hacking==0.12.0
 imagesize==0.7.1
 iso8601==0.1.11
 Jinja2==2.10
 keystoneauth1==3.4.0
 linecache2==1.0.0
 MarkupSafe==1.0
-mccabe==0.2.1
-mock==2.0.0
 mox3==0.20.0
-openstackdocstheme==1.18.1
 os-client-config==1.28.0
 oslosphinx==4.7.0
 oslotest==3.2.0
 pbr==2.0.0
-pep8==1.5.7
 prettytable==0.7.2
-pyflakes==0.8.1
 Pygments==2.2.0
 pyparsing==2.1.0
 pyperclip==1.5.27
@@ -36,10 +28,8 @@ pytz==2013.6
 PyYAML==3.12
 requests==2.14.2
 requestsexceptions==1.2.0
-six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.6.5
-sphinxcontrib-websupport==1.0.1
+stestr==2.0.0
 stevedore==1.20.0
 testrepository==0.0.18
 testscenarios==0.4

packages/generate_deb.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 apt update
-apt install -y python-stdeb
+apt install -y python-stdeb python-pip
+pip install pytz pbr
 python setup.py --command-packages=stdeb.command sdist_dsc --depends "python-pbr, python-dateutil" bdist_deb
 mkdir dist_pkg
 cp deb_dist/*.deb dist_pkg

requirements.txt

@@ -6,6 +6,5 @@ Babel>=2.5.0 # BSD
 cliff>=2.10.0 # Apache-2.0
 PyYAML>=3.12 # MIT
 python-dateutil>=2.5.3 # BSD
-six>=1.10.0 # MIT
 stevedore>=1.20.0 # Apache-2.0
 requests>=2.14.2 # Apache-2.0

setup.cfg

@@ -5,20 +5,21 @@ summary = Parser for TOSCA Simple Profile in YAML.
 description-file =
     README.rst
 author = OpenStack
-author-email = openstack-dev@lists.openstack.org
-home-page = http://docs.openstack.org/tosca-parser/
+author-email = openstack-discuss@lists.openstack.org
+home-page = https://docs.openstack.org/tosca-parser/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.4
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: Implementation :: CPython
 
 [files]
 packages =
@@ -30,17 +31,3 @@ console_scripts =
 toscaparser.extensions =
     tosca_simple_profile_for_nfv_1_0_0 = toscaparser.extensions.nfv.tosca_simple_profile_for_nfv_1_0_0:NfvProfile_1_0_0
     tosca_simple_profile_for_mec_1_0_0 = toscaparser.extensions.mec.tosca_simple_profile_for_mec_1_0_0:MecProfile_1_0_0
-
-[compile_catalog]
-directory = toscaparser/locale
-domain = toscaparser
-
-[update_catalog]
-domain = toscaparser
-output_dir = toscaparser/locale
-input_file = toscaparser/locale/toscaparser.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = toscaparser/locale/toscaparser.pot

setup.py

@@ -16,14 +16,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr>=2.0.0', 'pytz'],
     pbr=True)

test-requirements.txt

@@ -1,11 +1,11 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=4.0.0,<4.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT

toscaparser/elements/TOSCA_definition_1_0.yaml

@@ -17,6 +17,11 @@
 ##########################################################################
 tosca_definitions_version: tosca_simple_yaml_1_0
 
+metadata:
+ template_author: OpenStack
+ template_name: normative-types
+ template_version: '1.0'
+
 ##########################################################################
 # Node Type.
 # A Node Type is a reusable entity that defines the type of one or more
@@ -807,7 +812,6 @@ data_types:
           type: string
 
   tosca.datatypes.network.PortDef:
-    derived_from: tosca.datatypes.Root
     type: integer
     constraints:
       - in_range: [ 1, 65535 ]
@@ -953,6 +957,11 @@ policy_types:
     description: The TOSCA Policy Type definition that is used to declare
       performance requirements for TOSCA nodes or groups of nodes.
 
+  tosca.policies.Reservation:
+    derived_from: tosca.policies.Root
+    description: The TOSCA Policy Type definition that is used to create
+      TOSCA nodes or group of nodes based on the reservation.
+
 ##########################################################################
  # Group Type.
  # Group Type represents logical grouping of TOSCA nodes that have an

toscaparser/elements/capabilitytype.py

@@ -35,7 +35,8 @@ def get_properties_def_objects(self):
         parent_properties = {}
         if self.parent_capabilities:
             for type, value in self.parent_capabilities.items():
-                parent_properties[type] = value.get('properties')
+                if self.PROPERTIES in value:
+                    parent_properties[type] = value.get(self.PROPERTIES)
         if self.properties:
             for prop, schema in self.properties.items():
                 properties.append(PropertyDef(prop, None, schema))

toscaparser/elements/constraints.py

@@ -278,8 +278,8 @@ def __init__(self, property_name, property_type, constraint):
                                              'comparable values.')))
 
     def _is_valid(self, value):
-        if toscaparser.functions.is_function(value) or \
-           value >= self.constraint_value:
+        if value is not None and (toscaparser.functions.is_function(value) or
+                                  value >= self.constraint_value):
             return True
         return False
 
@@ -503,7 +503,7 @@ class MinLength(Constraint):
 
     valid_types = (int, )
 
-    valid_prop_types = (Schema.STRING, Schema.MAP)
+    valid_prop_types = (Schema.STRING, Schema.MAP, Schema.LIST)
 
     def __init__(self, property_name, property_type, constraint):
         super(MinLength, self).__init__(property_name, property_type,
@@ -514,7 +514,7 @@ def __init__(self, property_name, property_type, constraint):
                                              'expects an integer.')))
 
     def _is_valid(self, value):
-        if ((isinstance(value, str) or isinstance(value, dict)) and
+        if (isinstance(value, (str, dict, list)) and
            len(value) >= self.constraint_value):
             return True
 
@@ -538,7 +538,7 @@ class MaxLength(Constraint):
 
     valid_types = (int, )
 
-    valid_prop_types = (Schema.STRING, Schema.MAP)
+    valid_prop_types = (Schema.STRING, Schema.MAP, Schema.LIST)
 
     def __init__(self, property_name, property_type, constraint):
         super(MaxLength, self).__init__(property_name, property_type,
@@ -549,7 +549,7 @@ def __init__(self, property_name, property_type, constraint):
                                              'expects an integer.')))
 
     def _is_valid(self, value):
-        if ((isinstance(value, str) or isinstance(value, dict)) and
+        if (isinstance(value, (str, dict, list)) and
            len(value) <= self.constraint_value):
             return True
 
@@ -608,7 +608,7 @@ def _err_msg(self, value):
     Constraint.MIN_LENGTH: MinLength,
     Constraint.MAX_LENGTH: MaxLength,
     Constraint.PATTERN: Pattern
-    }
+}
 
 
 def get_constraint_class(type):