1 Description: Revert keystone 0.4.0 patch from upstream.
2 Author: James Page <james.page@ubuntu.com>
3 Bug: https://bugs.launchpad.net/ceilometer/+bug/1239651
4 Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb609216a07111067478f3755cceb4
6 Index: ceilometer/etc/ceilometer/ceilometer.conf.sample
7 ===================================================================
8 --- ceilometer.orig/etc/ceilometer/ceilometer.conf.sample 2013-12-12 13:11:29.243179330 -0800
9 +++ ceilometer/etc/ceilometer/ceilometer.conf.sample 2013-12-12 13:11:29.239179330 -0800
11 # server. (boolean value)
12 #http_connect_timeout=<None>
14 -# How many times are we trying to reconnect when communicating
15 -# with Identity API Server. (integer value)
16 -#http_request_max_retries=3
18 # Allows to pass in the name of a fake http_handler callback
19 # function used instead of httplib.HTTPConnection or
20 # httplib.HTTPSConnection. Useful for unit testing where
25 -# A PEM encoded Certificate Authority to use when verifying
26 -# HTTPs connections. Defaults to system CAs. (string value)
29 -# Verify HTTPS connections. (boolean value)
32 # Directory used to cache files related to PKI tokens (string
35 Index: ceilometer/tests/api/v2/test_acl_scenarios.py
36 ===================================================================
37 --- ceilometer.orig/tests/api/v2/test_acl_scenarios.py 2013-12-12 13:11:29.243179330 -0800
38 +++ ceilometer/tests/api/v2/test_acl_scenarios.py 2013-12-12 13:11:29.239179330 -0800
40 from ceilometer.api import acl
41 from ceilometer.publisher import rpc
42 from ceilometer.tests import db as tests_db
43 -from ceilometer.openstack.common import timeutils
45 from .base import FunctionalTest
50 class FakeMemcache(object):
55 + self.set_value = None
56 + self.token_expiration = None
59 if key == "tokens/%s" % VALID_TOKEN:
60 dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
61 return json.dumps(({'access': {
66 - }}, timeutils.isotime(dt)))
67 + }}, dt.strftime("%s")))
68 if key == "tokens/%s" % VALID_TOKEN2:
69 dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
70 return json.dumps(({'access': {
75 - }}, timeutils.isotime(dt)))
76 + }}, dt.strftime("%s")))
79 - def set(key, value, **kwargs):
81 + def set(self, key, value, **kwargs):
82 + self.set_value = value
86 class TestAPIACL(FunctionalTest,