Remove serialisation migration code, and update real-data-test with now-dated data

2 files changed, 2 insertions, 16 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index d70490c8e9a..26c99501d04 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -106,24 +106,10 @@ public class Nodes {
     public NodeList list(Node.State... inState) {
         NodeList allNodes = NodeList.copyOf(db.readNodes());
         NodeList nodes = inState.length == 0 ? allNodes : allNodes.state(Set.of(inState));
-        nodes = NodeList.copyOf(nodes.stream().map(node -> specifyFully(node, allNodes)).toList());
+        nodes = NodeList.copyOf(nodes.stream().toList());
         return nodes;
     }
 
-    // Repair underspecified node resources. TODO: Remove this after June 2023
-    private Node specifyFully(Node node, NodeList allNodes) {
-        if (node.resources().isUnspecified()) return node;
-
-        if (node.resources().bandwidthGbpsIsUnspecified())
-            node = node.with(new Flavor(node.resources().withBandwidthGbps(0.3)), Agent.system, clock.instant());
-        if ( node.resources().architecture() == NodeResources.Architecture.any) {
-            Optional<Node> parent = allNodes.parentOf(node);
-            if (parent.isPresent())
-                node = node.with(new Flavor(node.resources().with(parent.get().resources().architecture())), Agent.system, clock.instant());
-        }
-        return node;
-    }
-
     /** Returns a locked list of all nodes in this repository */
     public LockedNodeList list(Mutex lock) {
         return new LockedNodeList(list().asList(), lock);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTest.java
index 96338378892..df0f457b215 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTest.java
@@ -29,7 +29,7 @@ public class CapacityCheckerTest {
         var failurePath = tester.capacityChecker.worstCaseHostLossLeadingToFailure();
         assertTrue(failurePath.isPresent());
         assertTrue(tester.nodeRepository.nodes().list().nodeType(NodeType.host).asList().containsAll(failurePath.get().hostsCausingFailure));
-        assertEquals(4, failurePath.get().hostsCausingFailure.size());
+        assertEquals(5, failurePath.get().hostsCausingFailure.size());
     }
 
     @Test