Merge "Fix share replica details page for non-admins"

manila_ui/dashboards/project/shares/replicas/views.py

@@ -87,20 +87,25 @@ class DetailReplicaView(tabs.TabView):
         try:
             replica_id = self.kwargs['replica_id']
             replica = manila.share_replica_get(self.request, replica_id)
-            replica.export_locations = (
+            try:
-                manila.share_instance_export_location_list(
+                # The default policy for this API does not allow
-                    self.request, replica_id))
+                # non-admins to retrieve export locations.
-            export_locations = [
+                replica.export_locations = (
-                exp['path'] for exp in replica.export_locations
+                    manila.share_instance_export_location_list(
-            ]
+                        self.request, replica_id))
-            replica.el_size = ui_utils.calculate_longest_str_size(
+                export_locations = [
-                export_locations)
+                    exp['path'] for exp in replica.export_locations
+                ]
+                replica.el_size = ui_utils.calculate_longest_str_size(
+                    export_locations)
+            except Exception:
+                replica.export_locations = []
         except Exception:
             redirect = reverse(self._redirect_url)
             exceptions.handle(
                 self.request,
-                _('Unable to retrieve replica %sdetails.') % replica_id,
+                _('Unable to retrieve details of replica %s') %
-                redirect=redirect)
+                self.kwargs['replica_id'], redirect=redirect)
         return replica
 
     def get_tabs(self, request, *args, **kwargs):

manila_ui/dashboards/project/shares/templates/shares/replicas/_detail_overview.html

@@ -13,20 +13,22 @@
     <dd>{{ replica.status|capfirst }}</dd>
     <dt>{% trans "Replica state" %}</dt>
     <dd>{{ replica.replica_state|capfirst }}</dd>
-    <dt>{% trans "Export locations" %}</dt>
+    {% if replica.export_locations %}
-    {% for el in replica.export_locations %}
+        <dt>{% trans "Export locations" %}</dt>
-      <dd><p>
+        {% for el in replica.export_locations %}
-        <div><b>Path:</b>
+          <dd><p>
-            <input type="text" readonly="true"
+            <div><b>Path:</b>
-                   value="{{ el.path }}" size="{{ replica.el_size }}"
+                <input type="text" readonly="true"
-                   onClick="this.setSelectionRange(0, this.value.length)">
+                       value="{{ el.path }}" size="{{ replica.el_size }}"
-        </div>
+                       onClick="this.setSelectionRange(0, this.value.length)">
-        <div><b>Preferred:</b> {{ el.preferred }}</div>
+            </div>
-        {% if el.is_admin_only == True or el.is_admin_only == False %}
+            <div><b>Preferred:</b> {{ el.preferred }}</div>
-        <div><b>Is admin only:</b> {{ el.is_admin_only }}</div>
+            {% if el.is_admin_only == True or el.is_admin_only == False %}
-        {% endif %}
+            <div><b>Is admin only:</b> {{ el.is_admin_only }}</div>
-      </p></dd>
+            {% endif %}
-    {% endfor %}
+          </p></dd>
+        {% endfor %}
+    {% endif %}
     <dt>{% trans "Availability zone" %}</dt>
     <dd>{{ replica.availability_zone }}</dd>
 

manila_ui/tests/dashboards/project/shares/replicas/tests.py

@@ -103,17 +103,22 @@ class ReplicasTests(test.TestCase):
             mock.Mock(side_effect=Exception("Fake exception")))
         self._create_post()
 
-    def test_detail(self):
+    @ddt.data(True, False)
+    def test_detail_with_export_locations_available(self, exports_available):
         url = reverse(
             "horizon:project:shares:replica_detail",
             args=[self.share_replica.id])
-        export_locations = test_data.export_locations
+
+        export_locations_call_behavior = (
+            {'return_value': test_data.export_locations} if exports_available
+            else {'side_effect': Exception("Access denied to this resource")}
+        )
         self.mock_object(
             api_manila, "share_replica_get",
             mock.Mock(return_value=self.share_replica))
         self.mock_object(
             api_manila, "share_instance_export_location_list",
-            mock.Mock(return_value=export_locations))
+            mock.Mock(**export_locations_call_behavior))
 
         res = self.client.get(url)
 
@@ -125,10 +130,12 @@ class ReplicasTests(test.TestCase):
         self.assertContains(res, "<dd>%s</dd>" % self.share_replica.id, 1, 200)
         self.assertContains(
             res, "<dd>%s</dd>" % self.share.availability_zone, 1, 200)
-        for el in export_locations:
+        if exports_available:
-            self.assertContains(res, "value=\"%s\"" % el.path, 1, 200)
+            for el in test_data.export_locations:
-            self.assertContains(
+                self.assertContains(res, "value=\"%s\"" % el.path, 1, 200)
-                res, "<div><b>Preferred:</b> %s</div>" % el.preferred, 1, 200)
+                self.assertContains(
+                    res, "<div><b>Preferred:</b> %s</div>" % el.preferred,
+                    1, 200)
             self.assertContains(
                 res, "<div><b>Is admin only:</b> %s</div>" % el.is_admin_only,
                 1, 200)

releasenotes/notes/bug-1787016-fix-share-replica-details-eecdc8b43f2a6008.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The Share replica details page has been fixed to render correctly for
+    users with non-admin roles.