diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:54:57 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:54:57 +0200 |
| commit | cdaebc60ea153728e9744bfcfd1b867405d8ceb2 (patch) | |
| tree | 36b66c7a90cbcbde4c78046719c399cac029e4f6 /node-repository | |
| parent | 845125fb3aa0d0a438db1aa4b1d120040b1da0f9 (diff) | |
Remove canonical flavor
Diffstat (limited to 'node-repository')
3 files changed, 3 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java index be34e11f585..df817ebb8ad 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java @@ -145,7 +145,7 @@ class NodesResponse extends HttpResponse { } object.setString("openStackId", node.id()); object.setString("flavor", node.flavor().name()); - object.setString("canonicalFlavor", node.flavor().canonicalName()); + object.setString("canonicalFlavor", node.flavor().name()); object.setDouble("minDiskAvailableGb", node.flavor().getMinDiskAvailableGb()); object.setDouble("minMainMemoryAvailableGb", node.flavor().getMinMainMemoryAvailableGb()); object.setDouble("minCpuCores", node.flavor().getMinCpuCores()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java index b2966ccb91a..2094a68148e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java @@ -154,7 +154,7 @@ public class SerializationTest { Node node = nodeSerializer.fromJson(Node.State.provisioned, Utf8.toBytes(nodeData)); - assertEquals("large", node.flavor().canonicalName()); + assertEquals("large", node.flavor().name()); assertEquals(1, node.status().reboot().wanted()); assertEquals(2, node.status().reboot().current()); assertEquals(3, node.allocation().get().restartGeneration().wanted()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java index 0ecbf389825..eeb90a06951 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java @@ -225,7 +225,7 @@ public class DockerProvisioningTest { NodeList nodes = tester.getNodes(application1, Node.State.active); assertEquals(1, nodes.size()); - assertEquals("[vcpu: 1.0, memory: 1.0 Gb, disk 1.0 Gb]", nodes.asList().get(0).flavor().canonicalName()); + assertEquals("[vcpu: 1.0, memory: 1.0 Gb, disk 1.0 Gb]", nodes.asList().get(0).flavor().name()); } private Set<String> hostsOf(NodeList nodes) { |