luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #4410 from hashicorp/bugfix/gh-4175-service-ip 

UI - Bugfix: Show Service IP not the Node IP
This commit is contained in:
John Cowen 2018-07-18 18:39:39 +01:00 committed by GitHub
parent 56719485c8 7a41c40dbc
commit a1a0c1db0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-v2/app/templates/dc/services/show.hbs
View File

@ -37,7 +37,7 @@
href=(href-to 'dc.nodes.show' item.Node.Node) href=(href-to 'dc.nodes.show' item.Node.Node)
name=item.Node.Node name=item.Node.Node
service=item.Service.ID service=item.Service.ID
address=(concat item.Node.Address ':' item.Service.Port) address=(concat item.Service.Address ':' item.Service.Port)
checks=item.Checks checks=item.Checks
}} }}
{{/each}} {{/each}}
@ -57,7 +57,7 @@
data-test-node=item.Node.Node data-test-node=item.Node.Node
name=item.Node.Node name=item.Node.Node
service=item.Service.ID service=item.Service.ID
address=(concat item.Node.Address ':' item.Service.Port) address=(concat item.Service.Address ':' item.Service.Port)
checks=item.Checks checks=item.Checks
status=item.Checks.[0].Status status=item.Checks.[0].Status
}} }}

9
ui-v2/tests/acceptance/dc/services/show.feature
View File

@ -30,18 +30,21 @@ Feature: dc / services / show: Show Service
Service: Service:
ID: passing-service-8080 ID: passing-service-8080
Port: 8080 Port: 8080
Node:
Address: 1.1.1.1 Address: 1.1.1.1
Node:
Address: 1.2.2.2
- Service: - Service:
ID: service-8000 ID: service-8000
Port: 8000 Port: 8000
Node:
Address: 2.2.2.2 Address: 2.2.2.2
Node:
Address: 2.3.3.3
- Service: - Service:
ID: service-8888 ID: service-8888
Port: 8888 Port: 8888
Node:
Address: 3.3.3.3 Address: 3.3.3.3
Node:
Address: 3.4.4.4
--- ---
When I visit the service page for yaml When I visit the service page for yaml
--- ---