1120 Commits

Author SHA1 Message Date
Jenkins
c6f21ec0dc Merge "Remove oslo-incubator modules" 2016-11-22 23:07:21 +00:00
Jenkins
98f447ec0a Merge "Move required modules from oslo-incubator" 2016-11-22 23:07:07 +00:00
rabi
725dbf764f Use endpoint as endpoint_override
Number of projects like rally pass endpoint rather than
endpoint_override when using session with heatclient.

Use endpoint as endpoint_override when not specified.

Make it backward compatible.

Change-Id: Iff977424a15ac2ce3ffdf8d7c98d5e72d25c1e91
Closes-Bug: #1643507
2016-11-21 16:46:33 +05:30
Jenkins
57f9c0490b Merge "Change property option into append action" 2016-11-15 03:42:12 +00:00
rabi
2c27692f49 Remove oslo-incubator modules
This is the last patch in the series that removes all remaining
oslo-incubator modules. This also removes some unused scripts
in tools.

Change-Id: I4ca11596f1a2967e7c920c4ec7709c3408854534
2016-11-12 19:23:26 +05:30
rabi
b25baa9108 Move required modules from oslo-incubator
Move the required module to heatclient/common.

- heatclient/openstack/common/apiclient/base.py

It also moves some required functions and exceptions from
heatclient/openstack/common/cliutils.py and
heatclient/openstack/common/exceptions.py.

Change-Id: I68704c7fab9417492d8390ad05a9797f78d46907
2016-11-12 19:15:40 +05:30
OpenStack Proposal Bot
ea03fa2254 Updated from global requirements
Change-Id: I70f30c8eeba14510de319e65a79ee1f1603306ed
2016-11-09 23:03:51 +00:00
Jenkins
61794b7822 Merge "Graduate to oslo.i18n and cleanup incubator usage" 2016-11-09 07:17:03 +00:00
Chuck Short
29d6c613f6 Graduate to oslo.i18n and cleanup incubator usage
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>
2016-11-08 08:29:09 +05:30
gong yong sheng
3fd502030c Change property option into append action
Heat's other openstack commands are using append for such feature.
This patch changes property option from KeyValueAction into append
to make them consistent.

Change-Id: I34ef34c8fa1ece4e12e20a328a70fa8b389c29d2
Closes-bug: #1639107
2016-11-04 16:04:34 +08:00
Jenkins
c2d6de9a98 Merge "Return condition functions based on the filter param" 2016-11-03 05:03:34 +00:00
OpenStack Proposal Bot
911c61fe45 Updated from global requirements
Change-Id: Id7bf92858ba60111cb2c33bae55ba4bcae8c64a9
2016-10-22 01:26:51 +00:00
huangtianhua
0ac4a80dad Return condition functions based on the filter param
Add 'with_condition_func' filter param for API
template-function-list, if the param set to true,
the response will include the condition functions.

Change-Id: Ia7b4da71ed5c3da105dd23917e4921a96e445026
Closes-Bug: #1625505
2016-10-20 02:15:20 +00:00
Jenkins
c14e1827f6 Merge "Use region_name and interface with session" 2016-10-17 20:59:08 +00:00
Jenkins
a57ea56159 Merge "Fix "heat output-show -F json" output format" 2016-10-17 10:53:33 +00:00
OpenStack Proposal Bot
4e59ff4376 Updated from global requirements
Change-Id: I7ecbd1b97c9d83345a57a1af816b8b80fcd6ced9
2016-10-15 00:11:56 +00:00
rabi
6288620093 Use region_name and interface with session
Use region_name and interface  with session. Also use
public attributes of ClientManager for them.

Change-Id: Id836f503ff4d5189f90c4eaf68769bfbaa9dbd2f
2016-10-13 12:15:20 +05:30
Peter Razumovsky
9abc3588c0 Fix help string for osc resource show <resource>
Currently help string of <resource> tells "Name or ID of resource" which
is wrong - resource-show doesn't accepts ID's of resources.

Change-Id: I8b8f6c937e1119c90c0ef473c3784c0523593481
Related-bug: #1620291
2016-10-12 13:41:29 +00:00
Lars Kellogg-Stedman
0d218c92be handle empty sections in environment files
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
2016-10-07 11:10:29 -04:00
Jenkins
7f0f66e4fe Merge "Use event_time as default event sort key in OSC" 2016-10-03 06:24:44 +00:00
OpenStack Proposal Bot
5573fcae7b Updated from global requirements
Change-Id: If2713c9f475ab212efa4f07f9b7e9a28cb326ced
2016-10-02 20:34:33 +00:00
Jason Dunsmore
272c32f7ec Fix "heat output-show -F json" output format
So that it matches the equivalent OSC command's output.  Also change
the default output-show format to 'raw' to maintain current behavior.

Closes-Bug: #1560087
Change-Id: Ia03b1633565881b4b4a7f95e7b0c5df472487f62
2016-09-30 15:03:23 -05:00
Jason Dunsmore
988824784b Use event_time as default event sort key in OSC
Closes-Bug: #1599568
Change-Id: Id1e6e7669b03f5dd4a66a1e786a08eb9ade79307
2016-09-28 11:30:57 -05:00
OpenStack Proposal Bot
6ec59ad7fe Updated from global requirements
Change-Id: I97aec88125c4d4b67684040d817ded57cd34dc5e
2016-09-27 10:07:07 +00:00
OpenStack Proposal Bot
9a255f593c Updated from global requirements
Change-Id: I190426d8ce288ba2803dab56f1045cc39589c9c2
2016-09-26 04:26:41 +00:00
Jenkins
b4927057cc Merge "delete python bytecode including pyo before every test run" 2016-09-22 22:26:18 +00:00
Jenkins
0a4eb236c2 Merge "Improved the help message of the stack-list tags" 2016-09-22 22:26:07 +00:00
Jenkins
f2327cad82 Merge "Don't use endpoint_override with session" 2016-09-21 02:17:18 +00:00
Sharat Sharma
81284f3e82 Improved the help message of the stack-list tags
The stack-list help message for tags was not very helpful and was
confusing. So, changed the help message so that it is more
understandable for the user.

Change-Id: Ia49a40652a0c96ba257edb35bae4455be3373d0f
Closes-Bug: #1625011
2016-09-19 12:54:28 +05:30
Lucky samadhiya
34c07a6630 delete python bytecode including pyo before every test run
Change-Id: I435274c0010ceb7595b2e8c83848b010a9b42edd
2016-09-16 13:13:11 +05:30
Jenkins
67edf240c9 Merge "Add url in setup.cfg" 2016-09-09 10:03:28 +00:00
tamilhce
f2147f79aa Don't use endpoint_override with session
We should not use endpoint_override by default and rather
use service_type with session. This also refactors some of
the associated code.

However, if one wants to override the endpoint they can pass
endpoint_override to the client constructor along with session.

Change-Id: I7c27d8ff827de3b4bb3e70457c0b6a3f47b6d7bb
Co-Authored-By: Rabi Mishra <ramishra@redhat.com>
Closes-Bug: #1621505
2016-09-09 10:01:39 +05:30
Jenkins
dde6bc4d4f Merge "Replace functions 'Dict.get' and 'del' with 'Dict.pop'" 2016-09-07 11:54:37 +00:00
Jenkins
19ce71ba5d Merge "Show resource name path in event log formatter" 2016-09-07 09:55:19 +00:00
Jenkins
f8b6a0c9b4 Merge "Import mox in __init__.py" 2016-09-07 03:33:25 +00:00
Steve Baker
b28d8c6101 Show resource name path in event log formatter
The resource name path was introduced in the 'openstack stack failures'
command and is a user-friendly way of referring to a deeply nested
resource.

This change modifies the event log formatter to build and display the
resource name path for each event based only off data in previous
events.

For building the full resource path, and omitting ugly stack names
from the resource path, the following heat change is needed
Ib8feb7752bd5736785d142216312bb35629b3601. However the output is still
improved slightly when running against an older heat which does not
have this change.

Change-Id: I86b687fc516da215a6baeef8b365a520d12a8ab1
Closes-Bug: #1619415
2016-09-06 13:54:12 +12:00
Jenkins
41cd03f265 Merge "Modify use of assertTrue(A in B)" 2016-09-05 11:28:43 +00:00
shizhihui
12096c72c8 Add url in setup.cfg
Change-Id: I2696e3af9193e8da4184eb95d86b091e55e27299
2016-09-05 11:17:25 +08:00
Cao Xuan Hoang
80eecf92c9 Clean imports in code
This patch set modifies lines which are importing objects
instead of modules. As per openstack import guide lines, user should
import modules in a file not objects.

http://docs.openstack.org/developer/hacking/#imports

Change-Id: I9b7c8c7e37ee9861a63489f5b8fd611f2d31946e
2016-09-05 09:58:29 +07:00
Bin Zhou
7e869ca818 Modify use of assertTrue(A in B)
developers should use assertIn(A, B) instead of assertTrue(A in B ).

TrivialFix

Change-Id: Ia4dd3aedf338e967b379739aa80d7fbd6bfcd15e
2016-09-02 12:53:19 +08:00
shizhihui
f5bf3e755d Import mox in __init__.py
We can initialize the 'mox' of module mox3 in __init__.py,
then in these files that have modified, we only have
'import mox' other than 'from mox3 import mox', which can
make the code smaller and clear.

Change-Id: Ic09597a7205eed47bd3cff03d1e7bc78744e52d4
2016-09-01 12:47:34 +08:00
Jenkins
ed287fb913 Merge "Trivial:Standardize the output format of 'help' in shell.py" 2016-08-31 16:20:28 +00:00
bhagyashris
2ac87cbc3d Replace functions 'Dict.get' and 'del' with 'Dict.pop'
Refactoring code: Making 'kwargs' dict to use single instruction: pop()
rather than two instructions: get() and del, giving the codes a format
that carries through.

TrivialFix

Change-Id: I2b2221e92495beb88be8feb76adbc4d756a180f2
2016-08-30 15:49:10 +05:30
shizhihui
4f3e7cd99e Trivial:Standardize the output format of 'help' in shell.py
Change-Id: Ie6c03d56ab2f0aa14bc96028fd548e80987beeb1
2016-08-30 16:48:09 +08:00
rabi
da0da4c1af Add parameter_merge_startegies section
This adds parameter_merge_strategies section to environment.
This also adds the missing section parameter_encrypted_names.
We use a server side module and a client side module that have
deviated over a period of time. This patch syncs them. We probably
should move these to a library and use use them for both server and
client in the future.

Change-Id: I9b20a7cedd416b6d8b788a30f66e472b85babf4a
Blueprint: environment-merging
2016-08-25 11:09:40 +05:30
Jenkins
fb7802e591 Merge "Add a nested_depth argument to poll_for_events" 2016-08-25 03:06:13 +00:00
OpenStack Proposal Bot
5e6048899a Updated from global requirements
Change-Id: I6ff10598d00d61534fa6039050bb5c68a157db08
2016-08-25 01:11:08 +00:00
Steve Baker
573b6657f0 Add a nested_depth argument to poll_for_events
This will allow library calls to have more control over the depth of
events which are logged.

Change-Id: Iecb8c89745f916c50936e013a62176d586cfcc63
Closes-Bug: #1616682
2016-08-25 12:22:26 +12:00
shizhihui
060f11372b Update the home-page in setup.cfg
Change-Id: I94a67a4da0942691d5a9253c646d7d3c09a8cbe6
2016-08-16 10:30:49 +08:00
Jenkins
2f2549ad99 Merge "Standardize import format" 2016-08-04 04:08:17 +00:00