summaryrefslogtreecommitdiff
path: root/ceilometerclient
Commit message (Collapse)AuthorAgeFilesLines
* sync oslo codeicehouse-eol1.0.12stable/icehousegordon chung2014-10-029-324/+642
| | | | | | | | | | | - sync code up to Change-Id: Ie6064e73abe4b0729498a0343d50e1be35684b75 - includes fix to resolve alarm-evaluator failure - does not include openstack/common/strutils sync as it requires test update Co-Authored-By: Vaibhav Kale <vaibhav_kale@persistent.co.in> Closes-Bug: #1357343 Change-Id: Ieec08520cb39c5bf2e795dfeb3e36e52c6fd2a82
* switch to oslo.utilsgordon chung2014-09-293-15/+14
| | | | | | | oslo.utils is released and corresponding code in oslo-incubator has been removed. Change-Id: Ic3a13380809a8b00c979e5ac405b4084f486a31d
* Merge "Fix a help string nit for statistics command"1.0.11Jenkins2014-09-211-1/+1
|\
| * Fix a help string nit for statistics commandliu-sheng2014-09-091-1/+1
| | | | | | | | Change-Id: I0aee668d9a19da76bb01646c87b3cd17418822e5
* | Merge "keystone discovery fallback support"Jenkins2014-09-201-42/+41
|\ \
| * | keystone discovery fallback supportgordon chung2014-09-101-42/+41
| |/ | | | | | | | | | | | | | | | | version discovery and sessions aren't supported by all external auth systems. this patch adds a fallback when discovery does not work. Closes-Bug: #1333961 Change-Id: Ib253c736e37f8dbc50881f9fc691bfdb4ab87d71
* | Merge "Reduce redundant parameter of some commands in CLI"Jenkins2014-09-203-32/+79
|\ \
| * | Reduce redundant parameter of some commands in CLIls11752014-09-193-32/+79
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting an alarm, we use "ceilometer alarm-delete -a <ALARM_ID>", unlike other deleting commands of openstack, the parameter-a/--alarm_id is redundant. The similar situations exist in showing alarm, geting alarm state, showing resource and so on. It is more easy to use for reducing these parameters. New behaviour: $ ceilometer help alarm-show usage: ceilometer alarm-show [<ALARM_ID>] Show an alarm. Positional arguments: <ALARM_ID> ID of the alarm to show. $ ceilometer alarm-show alarm_id should not be empty $ ceilometer alarm-show abcde Not Found (HTTP 404) $ ceilometer alarm-show -a abcde -a is obsolete! See help for more details. Not Found (HTTP 404) $ ceilometer alarm-show --alarm_id abcde --alarm_id is obsolete! See help for more details. Not Found (HTTP 404) Co-Authored-By: Nejc Saje <nsaje@redhat.com> Change-Id: I1fbc85aa253929bfbb5e73ed834a725b9cf828b4 Closes-bug: #1268557
* | Typo "authtenticated" instead of "authenticated"Rafael Rivero2014-09-181-1/+1
| | | | | | | | | | | | | | Misspelling of "authenticated" found in docstring of method get_client in client.py Change-Id: I0b661a6b6008b416341ccbc691739094420723b1
* | Fix AuthPlugin authentificationPavlo Shchelokovskyy2014-09-151-1/+1
| | | | | | | | | | | | | | AuthPlugin wrongly assumed that self.opts['token'] is always a function. Change-Id: I968c62aec0d16d736693e403d03a495baf8ea15a Closes-Bug: #1369461
* | Merge "Verify alarm found before modifying"Jenkins2014-09-133-2/+30
|\ \
| * | Verify alarm found before modifyingEric Pendergrass2014-08-293-2/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current behavior is to retrieve alarm by id and conduct operations on the object. If the tenant doesn't own the alarm or isn't admin, the user will receive the message: 'NoneType' object has no attribute 'to_dict' Above message doesn't provide any useful diagnostic information and indicates a programming error since an unexpected None-type is encountered and not handled. This change verifies the alarm is found before using the object. If alarm not found it prints the same message for a not found Alarm as other PUT operations like alarm-state-set: Alarm not found: <alarm_id>. This message is more useful for diagnosis and gets rid of the uncaught None-type error. Change-Id: I66abcd4498b24ac7cadcf29fe3ced3fcda08458c Closes-Bug: #1348387
* | Fix sample-create in v2 api callsChris Dent2014-09-102-2/+2
|/ | | | | | | | | | | | | A dict embedded in a list is the expected input. In 47934c777c50897b649793e0960eebdaad322c45 the list was lost, this puts it back. Note that the _exact_ date of this failure was identified by existing Rally jobs which started failing in early August. That made searching the commit logs straightforward. Change-Id: I37e794de7a23b8ce8e67a086732af5a19f182409 Closes-Bug: #1367867
* Merge "Check if the alarm has time constraints field before displaying"Jenkins2014-08-282-28/+64
|\
| * Check if the alarm has time constraints field before displayingNejc Saje2014-08-252-28/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the bug that broke the alarms CLI if the alarm didn't have a time constraints field. Reduces code duplication of alarm printing code, so now all the alarm printing code is actually tested. Renames some auxiliary methods for more clarity. Change-Id: Ib691b4a5a6cf5ae133cd0a5576f90e4d0d189a92 Closes-bug: #1316390
* | Replace assertTrue with assertIsNotNone for check an objectjoey56782014-08-114-17/+16
| | | | | | | | | | | | | | | | | | assertTrue(*) means to check whether a boolean value/expression is true or not. For checking an object is not None, we should use assertIsNotNone(*), which gives more explicit expression. Change-Id: Ia4d0dcec81e97fe4774bff4e41a017f00b899ef3 Closes-Bug: #1297156
* | Add endpoint opt into auth_pluginEugeniya Kudryashova2014-08-081-1/+1
| | | | | | | | | | | | | | | | Endpoint should be present in auth_plugin options to allow connect to ceilometer through specified endpoint and token Closes-Bug: #1354507 Change-Id: I0aaafc6f599a67b242ade25efb3e667738bd71fd
* | Use HTTPClient from common Oslo codeekudryashova2014-07-3130-888/+497
| | | | | | | | | | | | | | | | | | In the process of unification of the clients code we should reuse common functionality from Oslo. bp common-client-library-2 Change-Id: I0e027c33ee42b6de032d33269caeea33e7837f40
* | Merge "Avoid empty entity field in uri path"Jenkins2014-07-242-15/+105
|\ \
| * | Avoid empty entity field in uri pathZhiQiang Fan2014-05-272-15/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, empty entity field is accepted but will fail when call cli, it is because the empty field leads to incorrect rest api uri, which will get 404 error. This patch checks some required entity fields, which will present in uri path, and raises CommandError if they are empty. Note the other required fields will not cause the same problem, so they are not checked. Change-Id: I59411b760ff7457064b386911e868518b3057e3a Closes-Bug: #1313679
* | | Merge "Don't expose X-Auth-Token in ceilometer CLI"Jenkins2014-07-231-1/+13
|\ \ \
| * | | Don't expose X-Auth-Token in ceilometer CLIZhi Kun Liu2014-07-181-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ceilometer CLI exposes X-Auth-Token in debug mode. This patch replaces X-Auth-Token's value with '{SHA1}<sha1oftoken>'. Some credentials are exposed by keystoneclient as ceilometerclient uses keystoneclient to authenticate, it will be fixed in bug: 100414. Change-Id: Ia6364314e4b4d26301f974582c0c2ba34b054c86 Partial-Bug: #1327019
* | | | Merge "Improve --debug logging output"Jenkins2014-07-221-1/+3
|\ \ \ \
| * | | | Improve --debug logging outputliu-sheng2014-07-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the following improvements to the output of a ceilometer command with the --debug option set: * Silences spurious logging from iso8601 and urllib3.connectionpool * Removes the line number from the logging format, since the intent of --debug is to show the user what network requests are occuring. Change-Id: I1b286adf63b1ca05ec4fcfb27fbc939aa662cc7e Closes-bug: #1324470
* | | | | Calculate a suitable column width for positional argumentsChristian Berendt2014-07-161-0/+12
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overwrite the method add_arguments in the class OpenStackHelpFormatter to calculate a suitable columnt width (max_help_position) for the positional arguments. example output before this patch: alarm-threshold-create Create a new alarm based on computed statistics. alarm-threshold-update Update an existing alarm based on computed statistics. alarm-update Update an existing alarm (Deprecated). example output after this patch: alarm-threshold-create Create a new alarm based on computed statistics. alarm-threshold-update Update an existing alarm based on computed statistics. alarm-update Update an existing alarm (Deprecated). Change-Id: I945e46bb9e0309b960e3322261d9d6ff9fa35b52 Closes-Bug: #1326471
* | | | Use suitable assertliuqing2014-07-092-4/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Replace assertTrue(a in b) with assertIn(a, b) Replace assertFalse(a in b) with assertNotIn(a, b) Replace assertTrue(a is None) with assertIsNone(a) Change-Id: I981c81908a823d9dbecbb2e139a86fbf589ce55e
* | | Merge "Update python-ceilometerclient to support Keystone V3 API"Jenkins2014-06-274-142/+364
|\ \ \
| * | | Update python-ceilometerclient to support Keystone V3 APIFabio Giannetti2014-06-264-142/+364
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keystone is now deprecating the V2 API in favor of the V3 API. The ceilometer client is now using the keystone session to delegate the discovery of the version that is going to be used, this eliminates the need of updating the client every time there is a new API version. DocImpact blueprint support-keystone-v3-api Change-Id: I6ebacce7adf70f24bdede9b920853ab9851071cf
* | | Merge "Fix alarm-threshold-update --query option"Jenkins2014-06-252-15/+32
|\ \ \
| * | | Fix alarm-threshold-update --query optionZhiQiang Fan2014-06-112-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, alarm-threshold-update command can not update its query field, because the dest value is removed accidently so the query is not put under threshold_rule dict. This patch simply adds it back. Change-Id: I2eeaf8cbb26f506e097dafdcb6d0eae4ad7fec3e Closes-Bug: #1313676
* | | | Merge "Add methods to resource classes"Jenkins2014-06-247-20/+105
|\ \ \ \ | |_|/ / |/| | |
| * | | Add methods to resource classesArtur Svechnikov2014-06-167-20/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resource classes of managers should have methods like delete() and get(). Basicly base.Resource class has method get(), which uses id attribute, but classes Alarm, Event, etc. have no this attribute. Added intercept getting of id in the resource classes. Also added catch of HTTPNotFound for alarm get() because it affects correct functionality of scenario tests. Closes-Bug: #1312146 Change-Id: Ie598b73c64dece2185955467936dc6544a8a3dc7
* | | | Merge "Provide explicit help string of resource-metadata"Jenkins2014-06-181-1/+2
|\ \ \ \
| * | | | Provide explicit help string of resource-metadataliu-sheng2014-06-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the "--resource-metadata" in ceilometer sample-create command is not easy to use. For compatibility, this patch just provides an explicit help string for the parameter. Change-Id: I6d68d5b653c3b33808cba6f9a781301fba9b44e3 Closes-Bug: #1324759
* | | | | Fix the alarm history order shown to userDina Belova2014-06-181-1/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Ceilometer storage backends implementation we are specially sorting the alarm history points in the following way: the first one by the timestamp should be the last one in the list. The Python client itself provides the information in this way, but the table printed had the opposite one, so this was fixed. Change-Id: If39bb5868e360f37ed76c12b55fc71eade331f47
* | | | Improve a bit query APIBoris Pavlovic2014-06-151-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make QueryManager.query arguments optional. At this point we are forced to speicify all filter, orderby, limit arguments as well to save order. So for example if I would like to get only 20 records I have to write something like: ceilometer.query_sample.query(None, None, 20) instead of ceilometer.query_sample.query(limit=20) As this doesn't break backward compatibility it shouldn't be a big deal to merge it. Change-Id: I5d589b27cafabd22204585a76f107125b2f3c7bd
* | | Merge "Fix hacking rules: H302,H305,H307,H402"Jenkins2014-06-1410-15/+16
|\ \ \
| * | | Fix hacking rules: H302,H305,H307,H402ZhiQiang Fan2014-06-1110-15/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, OpenStack Proposal Bot tries to update requirements with global requirements, while the upgraded hacking has introduced some new rules which are not fully handled by current code. This patch fixes some simple rules which are quite straight-forward. Change-Id: If8334f69fb1ad34fbbd6ad898e0e92eb3f81e95a
* | | Merge "Remove © and remove unnecessary encoding lines"Jenkins2014-06-1213-18/+5
|\ \ \ | |/ / |/| |
| * | Remove © and remove unnecessary encoding linesMartin Geisler2014-05-3013-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The word "Copyright" alone is sufficient to claim copyright, the © need not be present.[1] As per PEP 263, a Python file with non-ASCII characters must have a line with "coding: <some-encoding>". Python files containing only 7-bit ASCII characters need no such line.[2] This commit removes unnecessary Unicode copyright symbols and unnecessary encoding lines. [1]: http://www.copyright.gov/circs/circ03.pdf [2]: http://legacy.python.org/dev/peps/pep-0263/ Change-Id: I6b43cc5ecfd0440e06b0aebd91ebb574b7f37a91
* | | Merge "replace dict.iteritems() with six.iteritems(dict)"Jenkins2014-06-101-1/+1
|\ \ \
| * | | replace dict.iteritems() with six.iteritems(dict)Christian Berendt2014-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://wiki.openstack.org/wiki/Python3 dict.iteritems() should be replaced with six.iteritems(dict). Change-Id: I52cc0e89c030d7b6bfc735239638b513410933c5
* | | | Merge "use mock instead of try...finally"Jenkins2014-06-103-142/+85
|\ \ \ \
| * | | | use mock instead of try...finallyZhiQiang Fan2014-05-303-142/+85
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | There are some test code use try...finally block to catch or ignore the stdout message. The job can be done by mock too, and it is cleaner. Change-Id: I0c29382e7bcd0b7f399565b26f27315f7e17a8fc
* | | | Merge "Avoid unnecessary stderr message when run test"Jenkins2014-06-091-1/+2
|\ \ \ \
| * | | | Avoid unnecessary stderr message when run testZhiQiang Fan2014-05-271-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if we run `tox -epy27`, we will get an useless stderr message 'HTTPUnauthorized (HTTP 401)', which is triggered on purpose by a test. It should be mocked because it provides no such useful message. Change-Id: I009310257741a34fe966d6d745de3c6cf58e0feb Closes-Bug: #1323480
* | | | Refactor split_by_op and split_by_datatypeChris Dent2014-06-022-35/+130
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | split_by_op was returning data against which further error checking was then required. This change moves that error handling inside the method and simplifies the regular expression so that it splits (greedily) on the first operator it finds. If the split is not possible, it is a ValueError. If the field or value are empty, that is a ValueError. Both split_by_op and split_by_datatype were doing a findall() where a match() and split() do the right job and more efficiently. Regular expression compilation has been moved to the module level to insure they need only be compiled once. Operator keys must be sorted by length to ensure the point at which the split happens is most greedy. Using a split keeps the regex short and removes any statements about the left and right hand sides of the operator. Tests added to cover the method more completely, including testing for corner cases such as single character field or values or operators showing up in unexpected locations. 'string' variable renamed to 'query' and 'query_value' to avoid confusion. Named parameters on string substitution for clarity. Note that the tests which do self.assertRaises could more explicitly check the exception with self.assertRaisesRegexp but that would break compatibility with Python 2.6. Change-Id: Icd815ff65aba9eae3f76afee3bb33e85d85bea72 Closes-Bug: #1314544
* | | Merge "fixed several pep8 issues"Jenkins2014-05-297-24/+25
|\ \ \ | |/ / |/| |
| * | fixed several pep8 issuesChristian Berendt2014-05-167-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * E122 continuation line missing indentation or outdented * E126 continuation line over-indented for hanging indent * E128 continuation line under-indented for visual indent * E265 block comment should start with '# ' Tested with pep8 version 1.5.6 (2014-04-14). Change-Id: Iaea72c74d3678061b0ac837eb8fe8c85a883bb4a
* | | Fix exception handling of CLIliu-sheng2014-05-232-4/+4
| |/ |/| | | | | | | | | | | | | | | | | | | Because exc.Unauthorized exception has been removed for commit "Remove out-dated exceptions"(https://review.openstack.org/#/c/93852/). but it still in use in ceilometerclient.shell.CeilometerShell#main(). This patch replace exc.Unauthorized with exc.HTTPUnauthorized. And other three places of exc.NotFound are in use too. Change-Id: I3e010db20cb6f6636126cceed5c62a9817213739 Closes-bug: #1321649
View Lorry Controller Status