summaryrefslogtreecommitdiff
path: root/ceilometerclient
Commit message (Collapse)AuthorAgeFilesLines
* shell: do not force domain to be presentocata-em2.8.1Julien Danjou2017-03-161-19/+5
| | | | | | | If OS_PROJECT_NAME and Keystone v2 is used there's no need to set a domain. Change-Id: I9555b571224262b61255f70a30f540a32b8ae2fc (cherry picked from commit 536ebe20547c5f69255c698a1d1da9ea26d9bcac)
* Merge "cleanup aodh redirect"2.8.0Jenkins2017-01-232-7/+1
|\
| * cleanup aodh redirectgord chung2017-01-112-7/+1
| | | | | | | | Change-Id: I80684f79da471e22dbc1dacdeafa43c6cfa334a8
* | Merge "panko redirect"Jenkins2017-01-234-28/+38
|\ \ | |/
| * panko redirectgord chung2017-01-114-28/+38
| | | | | | | | | | | | same as aodh but with panko_endpoint Change-Id: Iae7d60e1cf139b79e74caf81ed7bdbd0bf2bc473
* | Merge "cleanup aodh mocks"Jenkins2017-01-231-16/+16
|\ \ | |/
| * cleanup aodh mocksgord chung2017-01-111-16/+16
| | | | | | | | | | | | don't pass in arg we don't use Change-Id: I14b9cd3178f929aa878f5caff97a6ba4318a42a0
* | Adding default project and domain if nothing is specifiedPrateek Khushalani2016-12-151-1/+9
|/ | | | | | Closes-Bug: 1543502 Change-Id: Iea57a6ed757bfa28eb09324378b5376667b0c120
* Add __ne__ built-in functiongecong19732016-11-231-0/+3
| | | | | | | | | | | | | In Python 3 __ne__ by default delegates to __eq__ and inverts the result, but in Python 2 they urge you to define __ne__ when you define __eq__ for it to work properly [1].There are no implied relationships among the comparison operators. The truth of x==y does not imply that x!=y is false. Accordingly, when defining __eq__(), one should also define __ne__() so that the operators will behave as expected. [1]https://docs.python.org/2/reference/datamodel.html#object.__ne_ Change-Id: I4ba5b370e34cd64b13d87ef3ce2869d224dd0969
* move old oslo-incubator code out of openstack/commonSteve Martinelli2016-11-0428-115/+98
| | | | | | | | | | | | | | As part of the first community-wide goal, teams were asked to remove the openstack/common package of their projects if one existed. This was a byproduct of the old oslo-incubator form of syncing common functionality. The package, apiclient, was moved to a top level location and a new i18n module was created. There is no oslo.apiclient library or equivalent, the recommended solution is to move it in tree and maintain it there. Change-Id: Ia788313e0926dc872a87b090ef0a350898bfb079
* Make method import_versioned_module workLuong Anh Tuan2016-11-033-11/+6
| | | | | | | | | Update function import_versioned_module in Oslo.utils 3.17. This patch update to meet new version. For more information: http://docs.openstack.org/developer/oslo.utils/history.html Change-Id: Ia031b53b27fcea66dbf4f2798d58b51c53c2d0cc Closes-Bug: #1627313
* Fixes SSLError during cclient.meters.list() by https2.7.0Ekaterina Khripunova2016-10-172-3/+3
| | | | | | | | | | | | The problem causes the function _adjust_kwargs(kwargs) which creates a new dict client_kwargs with new-named keys. It gets 'os_insecure' key from kwargs and gives it key-name 'insecure'. But the bug is in using kwargs.get('insecure') <which is None> to produse value of 'verify'. Change-Id: If77b2d3c75beddcd1a0a82353b56c84b29184ec7 Closes-Bug: 1634027 Related-Bug: 1394449
* Set code and details on HTTPExceptionMehdi Abaakouk2016-10-072-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
* Using assertIsNone() instead of assertEqual(None)Anh Tran2016-09-271-1/+1
| | | | | | | | | | | Following OpenStack Style Guidelines[1]: [H203] Unit test assertions tend to give better messages for more specific assertions. As a result, assertIsNone(...) is preferred over assertEqual(None, ...) and assertIs(..,None) [1] http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises Change-Id: Iae83c4360336cf07b6045615ff38933f52844499
* Replace assertEqual(None, ...) with assertIsNone(...)Hanxi Liu2016-09-201-1/+1
| | | | | | | | | From OpenStack Style Guidelines [1], [H203] Use assertIs(Not)None to check for None. [1] http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises Change-Id: Ib60e025af418678884d9bea91e1c318b3aadf4c9
* Deprecate alarms commandsJulien Danjou2016-09-081-1/+22
| | | | | | Users should switch to aodhclient Change-Id: Icb02052ef7a6c61e32747a94f2559bc0e786bda1
* Fix from_response method to process response from requestsAndrey 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
* 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
|\ \ \