summaryrefslogtreecommitdiff
path: root/ceilometerclient
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Decouple ceilometerclient without aodh services running" into ↵Jenkins2016-03-112-0/+14
|\ | | | | | | stable/mitaka
| * Decouple ceilometerclient without aodh services runningliusheng2016-03-112-0/+14
| | | | | | | | | | | | | | | | | | | | Currently, the ceilometerclient will be broken if aodh services not running, it will be worse if users don't want alarming service and they must start the aodh services. Change-Id: Idf7468f28cee001262b67b6e110357ffc971535a Closes-Bug: #1550095 (cherry picked from commit 78869fbccaffdf625fc1ec4ed3108bb7de892720)
* | Merge "Enhances client to support unique meter retrieval" into stable/mitakaJenkins2016-03-113-4/+35
|\ \
| * | Enhances client to support unique meter retrievalRohit Jaiswal2016-03-113-4/+35
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | meter list API is enhanced to support a unique param If specified as True, it returns a unique list of meters. This patch enhances the ceilometer-client to support the unique argument in the shell and the client bindings. DocImpact Closes-Bug: #1506959 Change-Id: I011ca725c25e1cdbe9891c3719f13f5cd34142ea (cherry picked from commit c45000c7594ad6fbfabf44c0615dce3021f43605)
* | make aggregation-method argument as a mandatory fieldxialinjuan2016-03-111-0/+1
|/ | | | | | | | When create the gnocchi alarm, the aggregation-method is required. Closes-Bug: #1531602 Change-Id: I65b5038053d69dc727639fbfeaa5a23108845083 (cherry picked from commit 63d629f423441ac7d3435370e6108897f23f3486)
* 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 "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 "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 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
* | 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
* Remove duplicated assertChaozhe.Chen2015-12-031-1/+0
| | | | Change-Id: I7159129411254a940122a88941a642feb6d72ef2
* 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
* | 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-232-4/+10
|\ \ | |/
| * Catch exception raised by keystoneauth1Mehdi Abaakouk2015-11-202-4/+10
| | | | | | | | | | | | | | | | | | We must support session object that comes from keystoneauth1 and keystoneclient. This change adds code path for keystoneauth1 when it misses. Change-Id: I1164a0a0745605b6bc4fd1fc8fb2813c7e40fb9b
* | 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
* Fix to enable meter-links on resource-list CLIRohit Jaiswal2015-10-233-1/+53
| | | | | | | | | | This adds an optional param to resource-list CLI to enable meter-links. By default, meter links are not generated, this patch adds an optional param to generate links. Change-Id: I308b94c8a57833cf30b4815ecec2ff9a50e91af6 Closes-Bug: #1508709
View Lorry Controller Status