Merge "Update the default implementation of _show_resource"

1 files changed, 9 insertions, 6 deletions

diff --git a/doc/source/developing_guides/pluginguide.rst b/doc/source/developing_guides/pluginguide.rst
index 8b3816209..d8d43345a 100644
--- a/doc/source/developing_guides/pluginguide.rst
+++ b/doc/source/developing_guides/pluginguide.rst
@@ -347,16 +347,19 @@ overridden:
            """Default implementation; should be overridden by resources.
 
            :returns: the map of resource information or None
-           """
+            """
            if self.entity:
                try:
                    obj = getattr(self.client(), self.entity)
                    resource = obj.get(self.resource_id)
-                   return resource.to_dict()
-                except AttributeError as ex:
-                    LOG.warning(_LW("Resolving 'show' attribute has "
-                                    "failed : %s"), ex)
-                    return None
+                   if isinstance(resource, dict):
+                       return resource
+                   else:
+                       return resource.to_dict()
+               except AttributeError as ex:
+                   LOG.warning("Resolving 'show' attribute has failed : %s",
+                               ex)
+                   return None
 
 Property and Attribute Example
 ******************************