summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set code and details on HTTPExceptionnewton-eol2.6.2stable/newtonMehdi Abaakouk2016-10-112-13/+25
| | | | | | | | | Even the HTTPException is unknown for ceilometer we should set the code and print it with the details. Closes-bug: #1626404 Change-Id: Ib244d8822f7a1ebc1b8ec1b95d13b20bbb69ece0 (cherry picked from commit b8a78396b273c23ba7a633d98365a5dfc969b1f2)
* Merge "Update .gitreview for stable/newton" into stable/newtonJenkins2016-09-071-0/+1
|\
| * Update .gitreview for stable/newtonDoug Hellmann2016-09-021-0/+1
| | | | | | | | Change-Id: I89fe41fb0f4365cedddf968e378f1370f692ed7f
* | 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-083-68/+0
|\ \
| * | Remove keystoneclient dependencyJulien Danjou2016-07-283-68/+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
* | Merge "Remove discover from test-requirements"Jenkins2016-07-281-1/+0
|\ \ | |/ |/|
| * Remove discover from test-requirementsSwapnil Kulkarni (coolsvap)2016-07-211-1/+0
| | | | | | | | | | | | It's only needed for python < 2.7 which is not supported Change-Id: I998be560850a2e51d2ba29552617f5722b67f203
* | Add support for Python 3.5Julien Danjou2016-07-273-67/+7
|/ | | | | | | 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
* Merge "base.Resource not define __ne__() built-in function"2.5.0Jenkins2016-07-122-1/+4
|\
| * 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
* | tools: remove unused scriptsJulien Danjou2016-07-054-411/+0
|/ | | | Change-Id: I3ca451288bfeb76a8c605ab76deb8531a7c81a12
* 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
* Merge "Correct the usage of the method assertEqual()"Jenkins2016-05-201-10/+10
|\
| * 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
* | Merge "Update the home-page with developer documentation"Jenkins2016-05-191-1/+1
|\ \ | |/ |/|
| * Update the home-page with developer documentationvenkatamahesh2016-05-171-1/+1
| | | | | | | | Change-Id: I1ca6f905e41bd3368b0db588840b8fc8697b5004
* | Merge "Update to hacking 0.11.0"Jenkins2016-05-176-16/+1
|\ \
| * | Update to hacking 0.11.0ZhiQiang Fan2016-05-136-16/+1
| | | | | | | | | | | | Change-Id: I858a418fa5202ec4fc0fc17f462b983f7864bcac
* | | Merge "Only install hacking in pep8"Jenkins2016-05-172-1/+1
|\ \ \ | |/ /
| * | Only install hacking in pep8ZhiQiang Fan2016-05-132-1/+1
| |/ | | | | | | | | | | | | There is no need to install all test requirements when we only do pep8 check. Change-Id: I12ecd682c38ac700cc9bd5395ef5d92e87c4acca
* | Merge "Enable releasenotes documentation"Jenkins2016-05-1711-0/+316
|\ \ | |/ |/|
| * Enable releasenotes documentationZhiQiang Fan2016-04-3011-0/+316
| | | | | | | | Change-Id: Iefdaa127bed9633bc6943b14d3080d28659280f8
* | Updated from global requirementsOpenStack Proposal Bot2016-05-101-2/+2
|/ | | | Change-Id: I402e49e8e58df801ed70df88b7088114ce69e17c
* Updated from global requirementsOpenStack Proposal Bot2016-04-191-1/+1
| | | | Change-Id: I16c85e68eb69713f86ceb6a635333fcb538eeff6
* Switch from deprecated tempest-lib to tempestJulien Danjou2016-04-122-2/+2
| | | | Change-Id: I2e94b8102ad19500068cc2688d11293e4e9b8aed
* Updated from global requirementsOpenStack Proposal Bot2016-04-081-1/+1
| | | | Change-Id: I6389abf6b03b0f1bbe5ef5b2ef1d663ecc22f7ad
* 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 "Updated from global requirements"Jenkins2016-02-241-1/+1
|\ \
| * | Updated from global requirementsOpenStack Proposal Bot2016-02-201-1/+1
| |/ | | | | | | Change-Id: I7235b786c6f51fa0449f2e89a8f39f9f4ea4af27
* | 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
* | Updated from global requirementsOpenStack Proposal Bot2016-02-081-1/+1
| | | | | | | | Change-Id: I541945808b5be54e94655a697be09823dca45020
* | Fixing a word spellingsanjana2016-02-051-2/+2
| | | | | | | | | | | | TRIVIAL-FIX: correct the word used in the comment Change-Id: I060a63a1363b0d73dc9a089bcdf1f50d79cc943c
* | Merge "Updated from global requirements"Jenkins2016-01-291-2/+2
|\ \
| * | Updated from global requirementsOpenStack Proposal Bot2016-01-231-2/+2
| |/ | | | | | | Change-Id: I19728752037266dabe78457d767b6d692c84a8de
* | Merge "improve readme contents"Jenkins2016-01-281-0/+8
|\ \ | |/ |/|
| * improve readme contentsricolin2016-01-201-0/+8
| | | | | | | | | | | | Add more information in README.rst Change-Id: I34d081c5a5661883bb178c9d8202d6012c3860bd
View Lorry Controller Status