Adjusted the test and fixed port mapping.

weaveworks · Mar 31, 2019 · 9ca9c4b · 9ca9c4b
1 parent d183e61
commit 9ca9c4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/pkg/cluster/formatter.go b/pkg/cluster/formatter.go
@@ -63,6 +63,11 @@ func (JSONFormatter) Format(machines []*Machine) error {
 			}
 			ports = append(ports, p)
 		}
+		if len(ports) < 1 {
+			for _, p := range m.spec.PortMappings {
+				ports = append(ports, port{Host:int(p.ContainerPort), Guest:0})
+			}
+		}
 		s.Ports = ports
 		statuses = append(statuses, s)
 	}

diff --git a/tests/test-show-ubuntu18.04.golden.output b/tests/test-show-ubuntu18.04.golden.output
@@ -1,22 +1,20 @@
-             NAME              HOSTNAME  PORTS              IMAGE              CMD  VOLUMES   STATE   
+             NAME              HOSTNAME  PORTS              IMAGE              CMD   STATE   
 
-  test-show-ubuntu18.04-node0  node0     22->0  quay.io/footloose/ubuntu18.04                Stopped  
+  test-show-ubuntu18.04-node0  node0     22->0  quay.io/footloose/ubuntu18.04       Stopped  
 {
   "machines": [
     {
       "name": "test-show-ubuntu18.04-node0",
-      "spec": {
-        "name": "node%d",
-        "image": "quay.io/footloose/ubuntu18.04",
-        "portMappings": [
-          {
-            "containerPort": 22
-          }
-        ]
-      },
-      "status": "Stopped",
-      "ports": null,
-      "hostname": "node0"
+      "state": "Stopped",
+      "ports": [
+        {
+          "guest": 0,
+          "host": 22
+        }
+      ],
+      "hostname": "node0",
+      "image": "quay.io/footloose/ubuntu18.04",
+      "cmd": ""
     }
   ]
 }