diff --git a/manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html b/manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html index 51858c01..855b9597 100644 --- a/manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html +++ b/manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html @@ -16,7 +16,7 @@
-

{% trans "Net Details" %}

+

{% trans "Network Details" %}


{% trans "Network" %}
@@ -31,19 +31,38 @@
-
-

{% trans "Security Services" %}

-
- {% for sec_service in share_network.sec_services %} - {% url 'horizon:project:security_services:security_service_detail' sec_service.id as sec_service_url%} -
-
{% trans "Id" %}
-
{{ sec_service.id }}
-
{% trans "Name" %}
-
{{ sec_service.name }}
-
{% trans "Type" %}
-
{{ sec_service.type }}
-
-
- {% endfor %} -
+ +{% if share_network.share_servers %} +
+

{% trans "Share Servers" %}

+
+
+ {% for server in share_network.share_servers %} + + {% endfor %} +
+
+{% endif %} + + +{% if share_network.sec_services %} +
+

{% trans "Security Services" %}

+
+ {% for sec_service in share_network.sec_services %} + {% url 'horizon:project:security_services:security_service_detail' sec_service.id as sec_service_url%} +
+
{% trans "Id" %}
+
{{ sec_service.id }}
+
{% trans "Name" %}
+
{{ sec_service.name }}
+
{% trans "Type" %}
+
{{ sec_service.type }}
+
+
+ {% endfor %} +
+{% endif %} diff --git a/releasenotes/notes/bug-1702396-add-share-servers-to-share-network-details-1cff66010817f1a8.yaml b/releasenotes/notes/bug-1702396-add-share-servers-to-share-network-details-1cff66010817f1a8.yaml new file mode 100644 index 00000000..01e4bdb0 --- /dev/null +++ b/releasenotes/notes/bug-1702396-add-share-servers-to-share-network-details-1cff66010817f1a8.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Share servers are added to the share network details page. The page has + been modified to show share servers and security services only if any + exist, or are retrievable from the server.