Merge "Rename node detail url name"

tuskar_ui/infrastructure/nodes/tables.py

@@ -163,7 +163,7 @@ def get_state_string(node):
 
 class BaseNodesTable(tables.DataTable):
     node = tables.Column('uuid',
-                         link="horizon:infrastructure:nodes:detail",
+                         link="horizon:infrastructure:nodes:node_detail",
                          verbose_name=_("Node Name"))
     role_name = tables.Column('role_name',
                               link=get_role_link,

tuskar_ui/infrastructure/nodes/tests.py

@@ -34,7 +34,7 @@ from tuskar_ui.test.test_data import tuskar_data
 
 INDEX_URL = urlresolvers.reverse('horizon:infrastructure:nodes:index')
 REGISTER_URL = urlresolvers.reverse('horizon:infrastructure:nodes:register')
-DETAIL_VIEW = 'horizon:infrastructure:nodes:detail'
+DETAIL_VIEW = 'horizon:infrastructure:nodes:node_detail'
 PERFORMANCE_VIEW = 'horizon:infrastructure:nodes:performance'
 TEST_DATA = utils.TestDataContainer()
 node_data.data(TEST_DATA)

tuskar_ui/infrastructure/nodes/urls.py

@@ -25,7 +25,7 @@ urlpatterns = urls.patterns(
     urls.url(r'^nodes_performance/$',
              views.PerformanceView.as_view(), name='nodes_performance'),
     urls.url(r'^(?P<node_uuid>[^/]+)/$', views.DetailView.as_view(),
-             name='detail'),
+             name='node_detail'),
     urls.url(r'^(?P<node_uuid>[^/]+)/performance/$',
              views.PerformanceView.as_view(), name='performance'),
 )

tuskar_ui/infrastructure/templates/infrastructure/_top_5_chart.html

@@ -9,7 +9,7 @@
   {% for d in top_5.data %}
   <tr>
     <td>
-      <a href="{% url 'horizon:infrastructure:nodes:detail' d.node_uuid %}">
+      <a href="{% url 'horizon:infrastructure:nodes:node_detail' d.node_uuid %}">
         {{ d.node_uuid|truncatechars:6 }}
       </a>
     </td>