Merge "Instance: show network info even if name is empty"

openstack_dashboard/api/neutron.py

@@ -1735,7 +1735,8 @@ def servers_update_addresses(request, servers, all_tenants=False):
         ports_floating_ips[fip.port_id].append(fip)
 
     # Map network id to its name
-    network_names = dict(((network.id, network.name) for network in networks))
+    network_names = dict((network.id, network.name_or_id)
+                         for network in networks)
 
     for server in servers:
         try:

openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html

@@ -69,7 +69,7 @@
     <hr class="header_rule">
     <dl class="dl-horizontal">
       {% for network, ip_list in instance.addresses.items %}
-        <dt>{{ network|title }}</dt>
+        <dt>{{ network }}</dt>
         <dd>
           {% if ip_list|length > 0 %}
             {% for ip in ip_list %}