delta/openstack/python-heatclient.git/heatclient/common/template_utils.py, branch master opendev.org: openstack/python-heatclient.git Remove six 2022-05-09T17:01:25+00:00 Takashi Kajinami tkajinam@redhat.com 2022-05-09T05:48:19+00:00 23e647539cb9c6872d9f72de99c21e113fded77c This library no longer supports Python 2, thus usage of six can be removed. Change-Id: I8d0c1cfd6dff375b3b7756a5b36c95a2df3f04c6 
This library no longer supports Python 2, thus usage of six can be
removed.

Change-Id: I8d0c1cfd6dff375b3b7756a5b36c95a2df3f04c6
Replace deprecated import of ABCs from collections 2021-12-16T07:21:36+00:00 Takashi Kajinami tkajinam@redhat.com 2021-07-16T15:51:50+00:00 796a8f5a9642a8ee0a455f59bbabe94e038fac4f ABCs in collections should be imported from collections.abc and direct import from collections is deprecated since Python 3.3. Closes-Bug: #1936667 Change-Id: Ie312cb884537ec541bf2111fe8a647e939b6519e 
ABCs in collections should be imported from collections.abc and direct
import from collections is deprecated since Python 3.3.

Closes-Bug: #1936667
Change-Id: Ie312cb884537ec541bf2111fe8a647e939b6519e
Add files-container option for stack create and update 2018-08-29T13:02:03+00:00 rabi ramishra@redhat.com 2018-03-12T02:22:33+00:00 bd2bfaa514cfc6769b74bd0c213c58bcc1eef6ea If files-container option is specified: - All template/env files would be fetched by the heat engine relative to the files_container and no local files other than the root template would be sent to server. - Relative path of environment files would be sent in the environment_files list. Also adds the option to template validate. Change-Id: I1a703ab8798a003365be650886bb78be5af472b7 Story: #1755453 Task: 19319 
If files-container option is specified:

- All template/env files would be fetched by the heat engine
  relative to the files_container and no local files other
  than the root template would be sent to server.
- Relative path of environment files would be sent in the
  environment_files list.

Also adds the option to template validate.

Change-Id: I1a703ab8798a003365be650886bb78be5af472b7
Story: #1755453
Task: 19319
Modify error message encountered during stack update 2017-10-27T15:03:25+00:00 PriyaDuggirala priyaduggirala02@gmail.com 2017-10-26T14:24:07+00:00 f73c2a4177377b710a02577feea38560b00a24bf Parameters of an existing stack can be updated with openstack stack update <stack> --existing --parameter <parameter>=<newvalue> Example : openstack stack update stack1 --parameter p1=v1 If the --existing option is skipped, it leads to the below error Need to specify exactly one of --template-file, --template-url or --template-object This error is misleading as the user might think that stack update cannot be performed without specifying a new template. Modify the error message with --existing option. Change-Id: Idce88bde848378e00b1c873245600ba205939668 Closes-Bug: #1723864 
Parameters of an existing stack can be updated with
openstack stack update <stack> --existing --parameter <parameter>=<newvalue>
Example : openstack stack update stack1 --parameter p1=v1
If the --existing option is skipped, it leads to the below error
Need to specify exactly one of --template-file, --template-url or --template-object
This error is misleading as the user might think that stack update
cannot be performed without specifying a new template.

Modify the error message with --existing option.

Change-Id: Idce88bde848378e00b1c873245600ba205939668
Closes-Bug: #1723864
Don't override sections in deep_update 2017-10-05T08:56:10+00:00 Thomas Herve therve@redhat.com 2017-10-03T14:10:29+00:00 2a8ce0d0656f47331a164163f9e3b302de4d3c88 When you comment all the elements in a YAML mapping, you end up with None instead of an empty mapping, which can have bad side effect when handling multiple environemnents. Let's handle that by ignoring the latest None value. Change-Id: I77ffabeb8d4cd2886ef4f41351e42ebe487b5d4b 
When you comment all the elements in a YAML mapping, you end up with
None instead of an empty mapping, which can have bad side effect when
handling multiple environemnents. Let's handle that by ignoring the
latest None value.

Change-Id: I77ffabeb8d4cd2886ef4f41351e42ebe487b5d4b
Replace six.iteritems() with .items() 2017-03-31T09:46:54+00:00 M V P Nitesh m.nitesh@nectechnologies.in 2017-03-31T09:45:17+00:00 61aa092ce5cdee495e6faf63c36419e5583d3627 1.As mentioned in [1], we should avoid using six.iteritems to achieve iterators. We can use dict.items instead, as it will return iterators in PY3 as well. And dict.items/keys will more readable. 2.In py2, the performance about list should be negligible, see the link [2]. [1] https://wiki.openstack.org/wiki/Python3 [2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html Change-Id: I3913e8876b34e112140788d7a405da6eedfb5f29 
1.As mentioned in [1], we should avoid using six.iteritems to achieve
iterators. We can use dict.items instead, as it will return iterators
in PY3 as well. And dict.items/keys will more readable.
2.In py2, the performance about list should be negligible, see the
link [2].
[1] https://wiki.openstack.org/wiki/Python3
[2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html

Change-Id: I3913e8876b34e112140788d7a405da6eedfb5f29
Graduate to oslo.i18n and cleanup incubator usage 2016-11-08T02:59:09+00:00 Chuck Short chuck.short@canonical.com 2016-10-26T23:30:18+00:00 29d6c613f674bec9f36a6207ba1b9f50886863e8 Graduate from Oslo Incubator to oslo.i18n library. Cleanup of unused Oslo Incubator utils. Added optional enable_lazy() usage. Change-Id: I5ec02477f3f52f4d7097669120581e82cced3748 Signed-off-by: Chuck Short <chuck.short@canonical.com> 
Graduate from Oslo Incubator to oslo.i18n library.
Cleanup of unused Oslo Incubator utils.
Added optional enable_lazy() usage.

Change-Id: I5ec02477f3f52f4d7097669120581e82cced3748
Signed-off-by: Chuck Short <chuck.short@canonical.com>
handle empty sections in environment files 2016-10-07T15:10:29+00:00 Lars Kellogg-Stedman lars@redhat.com 2016-10-07T15:05:59+00:00 0d218c92beb8f0fa11a18c2dc56bb92ed7feb785 If an environment file has an *empty* section, as in: parameter_defaults: This would ultimately fail in deep_update (in heatclient/common/template_utils.py), which would get called with old == None. This patch handles this situation by explicitly setting old = {} if deep_update is called with old == None. Change-Id: Ia7bee87cdb99e29c63c9dc163f8490fef3f24f24 Closes-bug: 1631408 
If an environment file has an *empty* section, as in:

    parameter_defaults:

This would ultimately fail in deep_update (in
heatclient/common/template_utils.py), which would get called with old
== None.  This patch handles this situation by explicitly setting old
= {} if deep_update is called with old == None.

Change-Id: Ia7bee87cdb99e29c63c9dc163f8490fef3f24f24
Closes-bug: 1631408
Fix obscure error message when no template given to OSC 2016-05-02T03:58:24+00:00 Paul Breaux p.breaux@f5.com 2016-05-02T03:46:27+00:00 f5d4721e5ff9ef1ff1bffec79ea8e024275d6798 This is an internal-only fix, as it does not change any external APIs. A bit of obfuscation was occurring in the 'template_utils.process_template_path' function call. First we try to retrieve the template from a urllib call. If that fails, then we try to make a request with the custom request_object function. If the request_object function failed to retrieve the template as well, it would report back 'ERROR: None'. I left both of the calls in this function, but I made the first exception bubble up back to the caller, since it is more helpful to the user. The new error message should report back the following when a template cannot be found: <urlopen error [Errno 2] No such file or directory: '/root/python-heatclient/test.yaml'> Closed Bug: #1570229 Change-Id: I29e19172322c18559aa476744f7ff3530e689bd0 
This is an internal-only fix, as it does not change any external APIs. A
bit of obfuscation was occurring in the
'template_utils.process_template_path' function call. First we try to
retrieve the template from a urllib call. If that fails, then we try to
make a request with the custom request_object function. If the
request_object function failed to retrieve the template as well, it
would report back 'ERROR: None'. I left both of the calls in this
function, but I made the first exception bubble up back to the caller,
since it is more helpful to the user.

The new error message should report back the following when a template
cannot be found:

<urlopen error [Errno 2] No such file or directory:
'/root/python-heatclient/test.yaml'>

Closed Bug: #1570229

Change-Id: I29e19172322c18559aa476744f7ff3530e689bd0
Fix regression handling relative paths in environment 2016-03-21T17:07:49+00:00 Steven Hardy shardy@redhat.com 2016-03-21T17:03:43+00:00 f13d36ae0114e159663ea2a3fa07260df9d9407d 7627e1bae53747e1471caf632dfc1b6edf2e26cf introduced new code to add the environment to the files mapping, so server side resolution of multiple environments is possible. However, the environment added is wrong when you're handling those with relative paths inside, we must add the resolved version or the keys don't map to keys in the files map, an you get an error when we try to locate the file on the server. Evidently we lack adequate functional test coverage of this, which can be addressed via a heat patch, but I added a unit test illustrating the problem. Change-Id: I3bd2cd48623e4ad1b4067f4cefc7ddff30b9e88d Closes-Bug: #1560106 
7627e1bae53747e1471caf632dfc1b6edf2e26cf introduced new code to add the
environment to the files mapping, so server side resolution of multiple
environments is possible.

However, the environment added is wrong when you're handling those with
relative paths inside, we must add the resolved version or the keys
don't map to keys in the files map, an you get an error when we try
to locate the file on the server.

Evidently we lack adequate functional test coverage of this, which can
be addressed via a heat patch, but I added a unit test illustrating
the problem.

Change-Id: I3bd2cd48623e4ad1b4067f4cefc7ddff30b9e88d
Closes-Bug: #1560106