From b44e828aa6bd8cda970e634a202b156e7775b41c Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 4 Jun 2018 15:34:16 -0700
Subject: [PATCH] Use the network ip as the task address instead of the node ip

---
 .../allocations/allocation/index.hbs          | 34 ++++++++-----------
 .../allocations/allocation/task/index.hbs     |  4 +--
 ui/tests/acceptance/task-detail-test.js       |  5 ++-
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/ui/app/templates/allocations/allocation/index.hbs b/ui/app/templates/allocations/allocation/index.hbs
index c2e0a60ce61..d1c0375ed2b 100644
--- a/ui/app/templates/allocations/allocation/index.hbs
+++ b/ui/app/templates/allocations/allocation/index.hbs
@@ -72,26 +72,20 @@
               <td data-test-time>{{moment-format row.model.events.lastObject.time "MM/DD/YY HH:mm:ss"}}</td>
               <td data-test-ports>
                 <ul>
-                  {{#each row.model.resources.networks.firstObject.reservedPorts as |port|}}
-                    <li data-test-port>
-                      <strong>{{port.Label}}:</strong>
-                      {{#if row.model.allocation.node.address}}
-                        <a href="http://{{row.model.allocation.node.address}}:{{port.Value}}" target="_blank">{{row.model.allocation.node.address}}:{{port.Value}}</a>
-                      {{else}}
-                        ...
-                      {{/if}}
-                    </li>
-                  {{/each}}
-                  {{#each row.model.resources.networks.firstObject.dynamicPorts as |port|}}
-                    <li>
-                      <strong>{{port.Label}}:</strong>
-                      {{#if row.model.allocation.node.address}}
-                        <a href="http://{{row.model.allocation.node.address}}:{{port.Value}}" target="_blank">{{row.model.allocation.node.address}}:{{port.Value}}</a>
-                      {{else}}
-                        ...
-                      {{/if}}
-                    </li>
-                  {{/each}}
+                  {{#with row.model.resources.networks.firstObject as |network|}}
+                    {{#each network.reservedPorts as |port|}}
+                      <li data-test-port>
+                        <strong>{{port.Label}}:</strong>
+                        <a href="http://{{network.ip}}:{{port.Value}}" target="_blank">{{network.ip}}:{{port.Value}}</a>
+                      </li>
+                    {{/each}}
+                    {{#each network.dynamicPorts as |port|}}
+                      <li>
+                        <strong>{{port.Label}}:</strong>
+                        <a href="http://{{network.ip}}:{{port.Value}}" target="_blank">{{network.ip}}:{{port.Value}}</a>
+                      </li>
+                    {{/each}}
+                  {{/with}}
                 </ul>
               </td>
             </tr>
diff --git a/ui/app/templates/allocations/allocation/task/index.hbs b/ui/app/templates/allocations/allocation/task/index.hbs
index 46fdd49f97d..ac13a503486 100644
--- a/ui/app/templates/allocations/allocation/task/index.hbs
+++ b/ui/app/templates/allocations/allocation/task/index.hbs
@@ -54,8 +54,8 @@
                 <td data-test-task-address-is-dynamic>{{if row.model.isDynamic "Yes" "No"}}</td>
                 <td data-test-task-address-name>{{row.model.name}}</td>
                 <td data-test-task-address-address>
-                  <a href="http://{{model.allocation.node.address}}:{{row.model.port}}" target="_blank">
-                    {{model.allocation.node.address}}:{{row.model.port}}
+                  <a href="http://{{network.ip}}:{{row.model.port}}" target="_blank">
+                    {{network.ip}}:{{row.model.port}}
                   </a>
                 </td>
               </tr>
diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js
index e475e840b4c..ee9e83821f5 100644
--- a/ui/tests/acceptance/task-detail-test.js
+++ b/ui/tests/acceptance/task-detail-test.js
@@ -2,7 +2,6 @@ import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helper
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 import moment from 'moment';
-import ipParts from 'nomad-ui/utils/ip-parts';
 
 let allocation;
 let task;
@@ -120,10 +119,10 @@ test('the addresses table lists all reserved and dynamic ports', function(assert
 });
 
 test('each address row shows the label and value of the address', function(assert) {
-  const node = server.db.nodes.find(allocation.nodeId);
   const taskResources = allocation.taskResourcesIds
     .map(id => server.db.taskResources.find(id))
     .findBy('name', task.name);
+  const networkAddress = taskResources.resources.Networks[0].IP;
   const reservedPorts = taskResources.resources.Networks[0].ReservedPorts;
   const dynamicPorts = taskResources.resources.Networks[0].DynamicPorts;
   const address = reservedPorts.concat(dynamicPorts).sortBy('Label')[0];
@@ -141,7 +140,7 @@ test('each address row shows the label and value of the address', function(asser
   );
   assert.equal(
     addressRow.querySelector('[data-test-task-address-address]').textContent.trim(),
-    `${ipParts(node.httpAddr).address}:${address.Value}`,
+    `${networkAddress}:${address.Value}`,
     'Value'
   );
 });