From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 16 Jan 2016 03:18:50 +0000 (+0000)
Subject: Merge "Use oslo.utils.reflection extract the class name"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d717d3a87abbd8d8177df9b7a4135aaab781071f;p=openstack-build%2Fneutron-build.git

Merge "Use oslo.utils.reflection extract the class name"
---

d717d3a87abbd8d8177df9b7a4135aaab781071f
diff --cc neutron/common/utils.py
index ca672ff9c,66e675bd1..98e3bed12
--- a/neutron/common/utils.py
+++ b/neutron/common/utils.py
@@@ -90,12 -93,14 +93,14 @@@ class cache_method_results(object)
          return item
  
      def __call__(self, target_self, *args, **kwargs):
+         target_self_cls_name = reflection.get_class_name(target_self,
+                                                          fully_qualified=False)
          if not hasattr(target_self, '_cache'):
              raise NotImplementedError(
 -                "Instance of class %(module)s.%(class)s must contain _cache "
 -                "attribute" % {
 +                _("Instance of class %(module)s.%(class)s must contain _cache "
 +                  "attribute") % {
                      'module': target_self.__module__,
-                     'class': target_self.__class__.__name__})
+                     'class': target_self_cls_name})
          if not target_self._cache:
              if self._first_call:
                  LOG.debug("Instance of class %(module)s.%(class)s doesn't "