Merge "Return export_locations as a list"

heat/engine/resources/openstack/manila/share.py

@@ -204,8 +204,8 @@ class ManilaShare(resource.Resource):
             return
         if name == self.EXPORT_LOCATIONS_ATTR:
             attr = self._request_export_locations()
-        else:
-            attr = getattr(self._request_share(), name)
+            return attr
+        attr = getattr(self._request_share(), name)
         return str(attr)
 
     def handle_create(self):

heat/tests/openstack/manila/test_share.py

@@ -225,7 +225,7 @@ class ManilaShareTest(common.HeatTestCase):
             DummyShareExportLocation()]
         self.assertEqual('az', share.FnGetAtt('availability_zone'))
         self.assertEqual('host', share.FnGetAtt('host'))
-        self.assertEqual("['el']", share.FnGetAtt('export_locations'))
+        self.assertEqual(['el'], share.FnGetAtt('export_locations'))
         self.assertEqual('id', share.FnGetAtt('share_server_id'))
         self.assertEqual('ca', share.FnGetAtt('created_at'))
         self.assertEqual('s', share.FnGetAtt('status'))

releasenotes/notes/story-2011146-07db485192f8c2f3.yaml

@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    ``OS::Manila::Share`` attribute ``export_locations`` will now be a list of
+    export paths
+fixes:
+  - |
+    ``OS::Manila::Share`` attribute ``export_locations`` will now be a list of
+    export paths