summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
* | Merge "Remove argparse from requirements"2.3.0Jenkins2016-01-211-1/+0
|\ \
| * | 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
|\ \ \
View Lorry Controller Status