summaryrefslogtreecommitdiff
path: root/ceilometerclient
Commit message (Collapse)AuthorAgeFilesLines
* Fix from_response method to process response from requests2.6.1Andrey Kurilin2016-09-072-2/+28
| | | | | | | | | | | | | | | | | SessionClient uses requests library. It's response class doesn't have "status" property[1], so in case of any errors(with status code > 400), from_response method is called and raises AttributeError. Also, HTTPClient implementation uses requests lib by default[2](if 'http' argument was not transmitted), so from_response method will raise AttributeError too. [1] - http://docs.python-requests.org/en/master/api/#requests.Response.status_code [2] - https://github.com/openstack/python-ceilometerclient/blob/2.6.0/ceilometerclient/openstack/common/apiclient/client.py#L99-L100 Change-Id: Id8fb2f386e8101951716f30a6365c9aa15bd4b24 Closes-Bug: #1620974 (cherry picked from commit 1b1917ab9b56fe92235ce336d3df3e7a8c1c81d2)
* Merge "Correct the parameters's position of assertEqual"2.6.0Jenkins2016-08-087-39/+39
|\
| * Correct the parameters's position of assertEqualxiaozhuangqing2016-07-297-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | assertEqual using should be assertEqual(expected, actual) misplace have two impacts: 1.giving confusing messages when some tests failed. 2.mislead other developer,new test modules may follow these wrong pattern see Partial-Bug https://bugs.launchpad.net/oslo.config/+bug/1604213 Change-Id: I4467d5efb1eed9f4c473c947c93afcfaf9be6ea6
* | Merge "Remove keystoneclient dependency"Jenkins2016-08-082-67/+0
|\ \
| * | Remove keystoneclient dependencyJulien Danjou2016-07-282-67/+0
| |/ | | | | | | Change-Id: I3589eca8fd6a581e57524cffa8a8f1278358f38c
* | [trivial] add a blank characterzhangguoqing2016-08-041-1/+1
|/ | | | | | | In ceilometer help event-list, the line "integer, floator datetime." should be "integer, float or datetime." Change-Id: Ib8976b5e580e2a95a4e04d7d95c815011127749c
* Add support for Python 3.5Julien Danjou2016-07-271-66/+5
| | | | | | | This fixes a test that check too much of the output formatting. Just test that some of the values we expect are there. Change-Id: I43a2c2d017bc99ef045ff2e4c5943f1607343ec1
* base.Resource not define __ne__() built-in functionyuyafei2016-07-042-1/+4
| | | | | | | | | | | Class base.Resource defines __eq__() built-in function, but does not define __ne__() built-in function, so self.assertEqual works but self.assertNotEqual does not work at all in this test case in python2. This patch fixes it by defining __eq__() built-in function of class base.Resource. Also fixes spelling errors:resoruces. Change-Id: I8a4e09e277a14a16105feab81ba8d07ceee5b47f Closes-Bug: #1586268
* Merge "Switch to keystoneauth"Jenkins2016-06-235-30/+27
|\
| * Switch to keystoneauthClenimar Filemon2016-06-015-30/+27
| | | | | | | | | | | | | | keystoneclient.auth is deprecated in favour of keystoneauth. This patch updates Ceilometerclient accordingly. Change-Id: Id4b14cbccfabfeaa5322f7ae5702261d0ed9cca2
* | Ignore aodh_endpoint argumentrabi2016-06-072-1/+20
|/ | | | | | | | | When using keystone session, we seem to pass all **kwargs to SessionClient for metering. We should drop the 'aodh_endpoint' from kwargs. Change-Id: Iaf28d4a525d49f62a0ae635dc1102cc1f0308c74 Closes-Bug: #1589425
* Correct the usage of the method assertEqual()hexin2016-05-191-10/+10
| | | | | | | The first argument of the method assertEqual() should be the expected value. Change-Id: I8ea18641e7563e6d7b2779888759d761c9a843f8
* Update to hacking 0.11.0ZhiQiang Fan2016-05-135-15/+0
| | | | Change-Id: I858a418fa5202ec4fc0fc17f462b983f7864bcac
* Switch from deprecated tempest-lib to tempestJulien Danjou2016-04-121-1/+1
| | | | Change-Id: I2e94b8102ad19500068cc2688d11293e4e9b8aed
* Fix the disorder of items of Traits in the output of event-listxialinjuan2016-03-232-4/+9
| | | | | | | | When use the command ceilometer event-list, the output is not alwarys ordered. This patch fix it. Closes-Bug: #1553932 Change-Id: I3af0fb25bd09ea9f15584219f07dd24ebb77c1cc
* Merge "remove default value of repeat-actions"Jenkins2016-03-143-1/+31
|\
| * remove default value of repeat-actionsZhiQiang Fan2016-03-103-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I94468ff649dd4367848c74e94a3feb08494bb223 fixes problem that ceilometeclient incorrectly reset repeat-actions when update any attribute. I53f3af447a8f814388985f6e4ab57a8ffec18a2a reverts most of the above change, which leading to bug 1539092. Because repeat-actions has default value False, no matter we set it or not, it will replace this bit when we get alarm from API. The unit test doesn't cover such case, so this change still succeeds in CI test. We don't need to revert it again, because the redundant code for create and update is not needed, repeat-actions has default value (False) in API side, so the proper way is simply removing the default value in CLI side. Change-Id: I39c28294db3e55141bb8a2024a6ddfdf8acf5e0d Closes-Bug: #1539092
* | Decouple ceilometerclient without aodh services runningliusheng2016-03-082-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
* Merge "Trivial: remove `None` as a redundant argument to dict.get()"Jenkins2016-02-251-1/+1
|\
| * Trivial: remove `None` as a redundant argument to dict.get()Chaozhe.Chen2016-02-221-1/+1
| | | | | | | | | | | | | | `dict.get()` returns `None` by default, if a key wasn't found. Removing `None` as second argument to avoid redundancy. Change-Id: I898219110206e9c49348f9a36f07b5ba1766f0f1
* | Merge "make aggregation-method argument as a mandatory field"Jenkins2016-02-241-0/+1
|\ \ | |/ |/|
| * make aggregation-method argument as a mandatory fieldxialinjuan2016-01-221-0/+1
| | | | | | | | | | | | | | When create the gnocchi alarm, the aggregation-method is required. Closes-Bug: #1531602 Change-Id: I65b5038053d69dc727639fbfeaa5a23108845083
* | Merge "Enhances client to support unique meter retrieval"Jenkins2016-02-093-4/+35
|\ \
| * | Enhances client to support unique meter retrievalRohit Jaiswal2016-02-053-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
* | Fixing a word spellingsanjana2016-02-051-2/+2
|/ | | | | | TRIVIAL-FIX: correct the word used in the comment Change-Id: I060a63a1363b0d73dc9a089bcdf1f50d79cc943c
* 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
|\
View Lorry Controller Status