debian/patches/revert-keystone-compat.patch

   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
   5
   6 --- a/etc/ceilometer/ceilometer.conf.sample
   7 +++ b/etc/ceilometer/ceilometer.conf.sample
   8 @@ -742,10 +742,6 @@ connection=sqlite:////var/lib/ceilometer
   9  # server. (boolean value)
  10  #http_connect_timeout=<None>
  11
  12 -# How many times are we trying to reconnect when communicating
  13 -# with Identity API Server. (integer value)
  14 -#http_request_max_retries=3
  15 -
  16  # Allows to pass in the name of a fake http_handler callback
  17  # function used instead of httplib.HTTPConnection or
  18  # httplib.HTTPSConnection. Useful for unit testing where
  19 @@ -778,13 +774,6 @@ connection=sqlite:////var/lib/ceilometer
  20  # (string value)
  21  #keyfile=<None>
  22
  23 -# A PEM encoded Certificate Authority to use when verifying
  24 -# HTTPs connections. Defaults to system CAs. (string value)
  25 -#cafile=<None>
  26 -
  27 -# Verify HTTPS connections. (boolean value)
  28 -#insecure=false
  29 -
  30  # Directory used to cache files related to PKI tokens (string
  31  # value)
  32  #signing_dir=<None>
  33 --- a/tests/api/v2/test_acl_scenarios.py
  34 +++ b/tests/api/v2/test_acl_scenarios.py
  35 @@ -27,7 +27,6 @@ from ceilometer import sample
  36  from ceilometer.api import acl
  37  from ceilometer.publisher import rpc
  38  from ceilometer.tests import db as tests_db
  39 -from ceilometer.openstack.common import timeutils
  40
  41  from .base import FunctionalTest
  42
  43 @@ -38,8 +37,12 @@ VALID_TOKEN2 = '4562138218392832'
  44
  45
  46  class FakeMemcache(object):
  47 -    @staticmethod
  48 -    def get(key):
  49 +    def __init__(self):
  50 +        self.set_key = None
  51 +        self.set_value = None
  52 +        self.token_expiration = None
  53 +
  54 +    def get(self, key):
  55          if key == "tokens/%s" % VALID_TOKEN:
  56              dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
  57              return json.dumps(({'access': {
  58 @@ -52,7 +55,7 @@ class FakeMemcache(object):
  59                      'roles': [
  60                          {'name': 'admin'},
  61                      ]},
  62 -            }}, timeutils.isotime(dt)))
  63 +            }}, dt.strftime("%s")))
  64          if key == "tokens/%s" % VALID_TOKEN2:
  65              dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
  66              return json.dumps(({'access': {
  67 @@ -65,11 +68,11 @@ class FakeMemcache(object):
  68                      'roles': [
  69                          {'name': 'Member'},
  70                      ]},
  71 -            }}, timeutils.isotime(dt)))
  72 +            }}, dt.strftime("%s")))
  73
  74 -    @staticmethod
  75 -    def set(key, value, **kwargs):
  76 -        pass
  77 +    def set(self, key, value, **kwargs):
  78 +        self.set_value = value
  79 +        self.set_key = key
  80
  81
  82  class TestAPIACL(FunctionalTest,