Set hostname field, not name field for hosts

rancher · Jan 29, 2016 · 102137e · 102137e
1 parent da26641
commit 102137e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/cattle/plugins/docker/compute.py b/cattle/plugins/docker/compute.py
@@ -253,7 +253,7 @@ def _add_resources(self, ping, pong):
         compute = {
             'type': 'host',
             'kind': 'docker',
-            'name': Config.hostname(),
+            'hostname': Config.hostname(),
             'createLabels': self._get_host_create_labels(),
             'labels': self._get_host_labels(),
             'physicalHostUuid': physical_host['uuid'],
@@ -264,7 +264,7 @@ def _add_resources(self, ping, pong):
         pool = {
             'type': 'storagePool',
             'kind': 'docker',
-            'name': compute['name'] + ' Storage Pool',
+            'name': compute['hostname'] + ' Storage Pool',
             'hostUuid': compute['uuid'],
             'uuid': compute['uuid'] + '-pool'
         }

diff --git a/tests/docker/ping_resp b/tests/docker/ping_resp
@@ -7,7 +7,7 @@
             {
                 "type" : "host",
                 "uuid" : "testuuid",
-                "name" : "localhost",
+                "hostname" : "localhost",
                 "physicalHostUuid" : "hostuuid",
                 "kind" : "docker",
                 "labels" : {

diff --git a/tests/docker/ping_stat_exception_resp b/tests/docker/ping_stat_exception_resp
@@ -7,7 +7,7 @@
             {
                 "type" : "host",
                 "uuid" : "testuuid",
-                "name" : "localhost",
+                "hostname" : "localhost",
                 "physicalHostUuid" : "hostuuid",
                 "kind" : "docker",
                 "info" : null,

diff --git a/tests/test_docker.py b/tests/test_docker.py
@@ -1223,9 +1223,9 @@ def pre(req):
 def assert_ping_stat_resources(resp):
     hostname = Config.hostname()
     pool_name = hostname + ' Storage Pool'
-    assert resp['data']['resources'][0]['name'] == hostname
+    assert resp['data']['resources'][0]['hostname'] == hostname
     assert resp['data']['resources'][1]['name'] == pool_name
-    resp['data']['resources'][0]['name'] = 'localhost'
+    resp['data']['resources'][0]['hostname'] = 'localhost'
     resp['data']['resources'][1]['name'] = 'localhost Storage Pool'