From 24c9037cae7c48156ba165d162f72ca3f1e7984f Mon Sep 17 00:00:00 2001 From: John Cowen Date: Wed, 18 Jul 2018 13:35:57 +0100 Subject: [PATCH 1/2] Make the tests break by switching to a Service.IP --- ui-v2/tests/acceptance/dc/services/show.feature | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ui-v2/tests/acceptance/dc/services/show.feature b/ui-v2/tests/acceptance/dc/services/show.feature index 29b3c4f892ed..b327e822dea1 100644 --- a/ui-v2/tests/acceptance/dc/services/show.feature +++ b/ui-v2/tests/acceptance/dc/services/show.feature @@ -30,18 +30,21 @@ Feature: dc / services / show: Show Service Service: ID: passing-service-8080 Port: 8080 - Node: Address: 1.1.1.1 + Node: + Address: 1.2.2.2 - Service: ID: service-8000 Port: 8000 - Node: Address: 2.2.2.2 + Node: + Address: 2.3.3.3 - Service: ID: service-8888 Port: 8888 - Node: Address: 3.3.3.3 + Node: + Address: 3.4.4.4 --- When I visit the service page for yaml --- From 1d31bef0a411519536528746a968a20a729ab56c Mon Sep 17 00:00:00 2001 From: John Cowen Date: Wed, 18 Jul 2018 13:37:14 +0100 Subject: [PATCH 2/2] Show the Service.IP address instead of the Node.IP address in detail --- ui-v2/app/templates/dc/services/show.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-v2/app/templates/dc/services/show.hbs b/ui-v2/app/templates/dc/services/show.hbs index b7e2652a1ef9..4e1c0dcda6f1 100644 --- a/ui-v2/app/templates/dc/services/show.hbs +++ b/ui-v2/app/templates/dc/services/show.hbs @@ -37,7 +37,7 @@ href=(href-to 'dc.nodes.show' item.Node.Node) name=item.Node.Node service=item.Service.ID - address=(concat item.Node.Address ':' item.Service.Port) + address=(concat item.Service.Address ':' item.Service.Port) checks=item.Checks }} {{/each}} @@ -57,7 +57,7 @@ data-test-node=item.Node.Node name=item.Node.Node service=item.Service.ID - address=(concat item.Node.Address ':' item.Service.Port) + address=(concat item.Service.Address ':' item.Service.Port) checks=item.Checks status=item.Checks.[0].Status }}