summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove argparse from requirementsAndreas Jaeger2016-01-201-1/+0
| |/ | | | | | | | | | | | | | | | | | | argparse was external in python 2.6 but not anymore, remove it from requirements. This should help with pip 8.0 that gets confused in this situation. Installation of the external argparse is not needed. Change-Id: Ib7e74912b36c1b5ccb514e31fac35efeff57378d
* | drop oslo-incubator modules: cliutils and uuidutilsZhiQiang Fan2016-01-195-319/+52
|/ | | | | | | * uuidutils has been ported to oslo.utils.uuidutils, so use the new one. * port cliutils to ceilometerclient.common.utils Change-Id: Ic5d3be140957510ed5d01f25552f2713845c4fdc
* Merge "Updated from global requirements"Jenkins2016-01-192-18/+18
|\
| * Updated from global requirementsOpenStack Proposal Bot2016-01-182-18/+18
| | | | | | | | Change-Id: I27e6a97b0418247173abe95f29a0095af4e0523f
* | Merge "Fix to disable meter-links from CLI"Jenkins2016-01-192-7/+0
|\ \ | |/ |/|
| * Fix to disable meter-links from CLIakanksha2016-01-082-7/+0
| | | | | | | | | | | | | | | | | | Removes the option of meter-links from CLI.Since meter-links are never shown. Change-Id: I3949bb6d77786926f22506d97d988f73fa614958 Closes-Bug: #1528318
* | Merge "fix project_id and user_id fields not set when create gnocchi alarm"Jenkins2016-01-182-0/+509
|\ \
| * | fix project_id and user_id fields not set when create gnocchi alarmxialinjuan2016-01-172-0/+509
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using command alarm-gnocchi-* the project_id and user_id are not set. The patch fix it and add related tests: 1.ceilometer gnocchi alarm create/update test cases 2.check gnocchi alarm create/update command args test cases 3.check update alarm without alarm-id 4.check shadowed args are restored Closes-Bug: #1506509 Change-Id: If6a8cfd9bc52b3eeff99dfcfdee2f4da7220674b
* | | remove unused codeZhiQiang Fan2016-01-191-37/+0
|/ / | | | | | | Change-Id: Ie2c764b4f0f1f55a580937e2dcfa3977e87efd47
* | Merge "change the dict output format to make consistency under py27 and py34"Jenkins2016-01-152-18/+49
|\ \
| * | change the dict output format to make consistency under py27 and py34xialinjuan2016-01-142-18/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the command output in ceilometer cli, if it is a dict and it has items which is list type, originally it won't handle the items in the list. As to under py27, the string type in the list is unicode, the string always look like u"http://alarm", while under py34 the string is "http://alarm", this cause output inconsistency. This patch will handle this inconsistency. Change-Id: I5e7cf4052f68e5a434bcf86242b11365b34750a0
* | | Merge "Updated from global requirements"Jenkins2016-01-151-1/+1
|\ \ \
| * | | Updated from global requirementsOpenStack Proposal Bot2016-01-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I5ea12983db4a7df3b9189de124094e9dbda0c022
* | | | Merge "Use the oslo.utils.reflection to extract the class name"Jenkins2016-01-151-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Use the oslo.utils.reflection to extract the class nameLiuNanke2016-01-081-1/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The oslo.utils reflection module/code handles more variations of where a class name may come from (on python 2 and python 3) so its usage allows getting more accurate class names so we might as well use it. Change-Id: Ic6a1d4a34336ae6501c48e92e8114932c283650f
* | | improve help docs for cli commandsIgor Degtiarov2016-01-141-7/+13
| | | | | | | | | | | | | | | | | | | | | Adds default field into help docs for all lists cli commands. Closes-bug: #1527271 Change-Id: I3081f273bf7b5fd512b0bbd105b3dfd1d69772b9
* | | Merge "Only token or creds are required."2.2.1Jenkins2016-01-132-10/+31
|\ \ \ | |_|/ |/| |
| * | Only token or creds are required.Mehdi Abaakouk2016-01-132-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | When token is provided and not the endpoint, the client works, because keystoneauth/keystoneclient will use the service_type to discover the endpoint. Closes-bug: #1533712 Change-Id: I0cf1ba52f656a450d358b2356df67d004f9aba7d
* | | 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
View Lorry Controller Status