summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Don't copy the auth_plugin for aodh"2.2.0Jenkins2016-01-125-227/+127
|\
| * Don't copy the auth_plugin for aodhMehdi Abaakouk2016-01-075-227/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | We must not copy a keystone session object or auth_plugin object. This change simplifies the aodh redirection code by: * sharing the keystone session object between aodh and ceilometer client * creating a new AuthPlugin() for the aodh client instead of copying the ceilometer one and then change its content. Closes-bug: #1531452 Change-Id: I2b2195e32c5dd74136237f7166c9c0d325434611
* | Merge "Restructuring a comment in Python-Ceilometerclient"Jenkins2016-01-111-5/+4
|\ \
| * | Restructuring a comment in Python-CeilometerclientSanjana Pai2015-12-141-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | The comment describes the handling of HTTPNotFound exception about alarm, but it is ambiguous, this change make it more clear. Closes-Bug:#1523866 Change-Id: Id7be71dcda6693875222435e10cba929e7c81e56
* | | Merge "Remove openstack-common.conf"Jenkins2016-01-111-9/+0
|\ \ \
| * | | Remove openstack-common.confLiuNanke2016-01-071-9/+0
| | |/ | |/| | | | | | | | | | | | | | | | We don't sync from oslo-incubator, so don't need this file any more. Change-Id: I7160d4122c3c21aa62fa19e34f6b73ee8c35de69
* | | Merge "remove py24 compatible code"Jenkins2016-01-071-7/+0
|\ \ \
| * | | remove py24 compatible codeZhiQiang Fan2016-01-081-7/+0
| | | | | | | | | | | | | | | | Change-Id: If62986b3ba913776ee6b9328a10e358e0e14e7cd
* | | | Merge "Improve ceilometer alarm enabled input parameter validation"Jenkins2016-01-071-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Improve ceilometer alarm enabled input parameter validationapril2016-01-051-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strict the input parameter of enabled in the command : ceilometer alarm-threshold-update <alarm-id> --enabled {True|False} This commit will improve the enabled value validation, if the input value is invalid such as "abde" "enabled", error info will be returned. Closes-Bug: #1531042 Change-Id: Ic553bc9ffa05a84575fc5626416c79fc84687bbe
* | | Use assertTrue/False instead of assertEqual(T/F)Swapnil Kulkarni (coolsvap)2016-01-072-5/+5
|/ / | | | | | | | | | | | | | | The usage of assertEqual(True/False, ***) should be changed to a meaningful format of assertTrue/False(***). Change-Id: Iabf8d017b47025309f186afb5e30b8ad990c2448 Closes-Bug:#1512207
* | Updated from global requirementsOpenStack Proposal Bot2015-12-211-1/+1
| | | | | | | | Change-Id: Ib016dc7d31d4764e9a22ac45b9fb0d974cde47d2
* | Merge "Replace assertEqual(None, *) with assertIsNone in tests"Jenkins2015-12-211-1/+1
|\ \
| * | Replace assertEqual(None, *) with assertIsNone in testsShuquan Huang2015-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace assertEqual(None, *) with assertIsNone in tests to have more clear messages in case of failure. Change-Id: I36db8bdcb67b8cc0a3bf1f063b4a7b42955b100b Closes-bug: #1280522
* | | Merge "remove MANIFEST.in"Jenkins2015-12-161-8/+0
|\ \ \
| * | | remove MANIFEST.inZhiQiang Fan2015-12-171-8/+0
| |/ / | | | | | | | | | | | | | | | pbr now can generate those content by default Change-Id: I710502b73b020b7ee7309e00ff6f1ab83f8163e4
* | | Updated from global requirementsOpenStack Proposal Bot2015-12-152-4/+4
|/ / | | | | | | Change-Id: Ief6c8c5529660142fdd9bba98ed703b782ccefc3
* | Deprecated tox -downloadcache option removedOndřej Nový2015-12-111-3/+0
|/ | | | | | | | | | Caching is enabled by default from pip version 6.0 More info: https://testrun.org/tox/latest/config.html#confval-downloadcache=path https://pip.pypa.io/en/stable/reference/pip_install/#caching Change-Id: Iffa03444402f08c32efd698ba9694d9312edbd5e
* Merge "Revert "Delete python bytecode before every test run""Jenkins2015-12-041-2/+0
|\
| * Revert "Delete python bytecode before every test run"Julien Danjou2015-12-031-2/+0
| | | | | | | | | | | | | | | | I don't like recompiling my Python files on each run. This reverts commit ce8957f04ffc5277645c59ab05232ead04373913. Change-Id: I34cd22d249a201d3f5c948075dbd762085818cab
* | Merge "Remove py26 support"Jenkins2015-12-032-2/+1
|\ \
| * | Remove py26 supportshu-mutou2015-12-022-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as of mitaka, the infra team won't have the resources available to reasonably test py26, also the oslo team is dropping py26 support from their libraries. sine we rely on oslo for a lot of our work, and depend on infra for our CI, we should drop py26 support too. Change-Id: I2218cf3464a9c1667f8eb812a519b2bc3ffe4d0d Closes-Bug: 1519510
* | | Merge "Remove duplicated assert"Jenkins2015-12-031-1/+0
|\ \ \ | |_|/ |/| |
| * | Remove duplicated assertChaozhe.Chen2015-12-031-1/+0
| | | | | | | | | | | | Change-Id: I7159129411254a940122a88941a642feb6d72ef2
* | | Delete python bytecode before every test runshu-mutou2015-12-031-0/+2
|/ / | | | | | | | | | | | | | | | | Because python creates pyc files during tox runs, certain changes in the tree, like deletes of files, or switching branches, can create spurious errors. Change-Id: Ia60baa319624e8ae5f833b6956323cf9e973d1b7 Closes-Bug: #1368661
* | Fix Python 3 version announced in metadataJulien Danjou2015-12-021-1/+1
| | | | | | | | Change-Id: I71acba65fc610e258924b6aa5dd11c52d5987e13
* | Merge "Fix the parameter order of assertEqual in ceilometerclient"Jenkins2015-12-022-21/+21
|\ \ | |/ |/|
| * Fix the parameter order of assertEqual in ceilometerclientSteve Wilkerson2015-12-012-21/+21
| | | | | | | | | | | | | | | | | | On assertEqual, the parameter order should be (expected, actual). Some of the tests in ceilometer client were written with invalid parameter orders. This patch fixes those tests. Change-Id: I9a7a81bdb0d9224f2b9cd53b7fb6eaf5ed7a582a Partial-Bug: 1277104
* | Fix Resource.__eq__ mismatch semantics of object equalRui Chen2015-12-012-2/+45
|/ | | | | | | | | | | | The __eq__ of apiclient.base.Resource will return True, if the two objects have same id, even if they have different other attributes value. The behavior is weird and don't match the semantics of object equal. The objects that have different value should be different objects. Fix this issue and add some test cases in this patch. Change-Id: Ieb28aa179bda945686e0d9c2f341c373ce2bab74 Closes-Bug: #1499369
* Merge "Token will be lost when constructing a ceilometer client"2.1.0Jenkins2015-11-301-1/+3
|\
| * Token will be lost when constructing a ceilometer clientxiangjun li2015-11-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | If parameters os_token and os_endpoint were passed to ceilometerclient.client.get_client to construct a ceilometer client, the token will be wrongly replaced with None in method ceilometerclient.client._adjust_kwargs, which will cause the authentication error when use the instance of ceilometer client later. This patch fixed this problem. Change-Id: Ib15cdd73b62b7f0b86d0bd6f19d344fd24a665f6 Closes-Bug: #1519729
* | Updated from global requirementsOpenStack Proposal Bot2015-11-271-1/+1
| | | | | | | | Change-Id: I46395d378a24b926c1bf4030b44f0f7983234d12
* | Merge "Ensure metering is the default service_type"Jenkins2015-11-271-2/+2
|\ \
| * | Ensure metering is the default service_typeMehdi Abaakouk2015-11-201-2/+2
| | | | | | | | | | | | Change-Id: Ia5e924eb58aac7fd53e9fe4a3dbdee102ece3ad7
* | | Merge "Ensure keystoneauth1 exception are raised"Jenkins2015-11-271-1/+5
|\ \ \ | |/ /
| * | Ensure keystoneauth1 exception are raisedMehdi Abaakouk2015-11-201-1/+5
| | | | | | | | | | | | Change-Id: I808a2a32860a6fe6b9b1797dd59a0ebed08d7b0a
* | | Merge "Correct an api reference error"Jenkins2015-11-261-1/+1
|\ \ \
| * | | Correct an api reference errorLianhao Lu2015-11-251-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | Correct a nit doc string error which is populated into api reference doc. Change-Id: I53e2d5ea820891d90f522889743ce94802f0576e
* | | Merge "Ignores endpoint_type if interface is provided"Jenkins2015-11-261-2/+2
|\ \ \ | |/ / |/| / | |/
| * Ignores endpoint_type if interface is providedMehdi Abaakouk2015-11-201-2/+2
| | | | | | | | | | | | | | When a keystone session object is used, if endpoint_type and interface is provided, we must use interface and drops endpoint_type. Change-Id: I379e18f684aa5092f8adbeaebe98030053115767
* | Merge "Remove double API requests"Jenkins2015-11-232-1/+11
|\ \ | |/
| * Remove double API requestsMehdi Abaakouk2015-11-202-1/+11
| | | | | | | | | | | | | | | | When a keystone session object is used API call are done twice. This change fixes that. Change-Id: I79815520b996bce954fe531193f1a0229ef30060
* | Merge "Catch exception raised by keystoneauth1"Jenkins2015-11-233-4/+11
|\ \ | |/
| * Catch exception raised by keystoneauth1Mehdi Abaakouk2015-11-203-4/+11
| | | | | | | | | | | | | | | | | | We must support session object that comes from keystoneauth1 and keystoneclient. This change adds code path for keystoneauth1 when it misses. Change-Id: I1164a0a0745605b6bc4fd1fc8fb2813c7e40fb9b
* | Updated from global requirementsOpenStack Proposal Bot2015-11-191-1/+1
| | | | | | | | Change-Id: Ic02772aaee94f8e1c9c59d24d4177dcbb0449b1e
* | Updated from global requirementsOpenStack Proposal Bot2015-11-181-1/+1
| | | | | | | | Change-Id: Iad06da2ce39a3c4d2ab8514d362c17de6be49e4a
* | Last sync from oslo-incubator2.0.1Davanum Srinivas2015-11-121-4/+5
| | | | | | | | | | | | | | oslo-incubator will cease to host common code soon. This is hopefully the very last sync from oslo-incubator. Change-Id: I5adf01a6db61f34c1699c52c08cd47c4edccd8fd
* | fix gnocchi alarm create to use right field namePradeep Kilambi2015-11-051-1/+1
|/ | | | | | Closes-Bug: #1509430 Change-Id: I4f3b60776230dec5ac0ee31369fbe95cb0a8cd71
* Update help message for alarm-gnocchi-resources-threshold-create2.0.0Rohit Jaiswal2015-10-281-1/+7
| | | | | | | | | | Help message for '--aggregation-method' in alarm-gnocchi-resources-threshold-create command is not precise. The problem is that 'avg' is not a valid aggregation method in gnocchi. This fix updates the help message. Change-Id: I513b6fb9db9f96bfdd10391b6acd5c95e278f601 Closes-Bug: #1506549
* Updated from global requirementsOpenStack Proposal Bot2015-10-231-1/+1
| | | | Change-Id: I8b4a2b55ee78b26943ae484ecef0c5c7e7519d9e
View Lorry Controller Status