Merge pull request #20331 from vespa-engine/mpolden/use-id-field

Remove openStackId field from client type

1 files changed, 4 insertions, 11 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
index 1551ecbb7ca..71f08f7318d 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
@@ -37,8 +37,6 @@ public class NodeRepositoryNode {
     private Set<String> additionalIpAddresses;
     @JsonProperty("additionalHostnames")
     private List<String> additionalHostnames;
-    @JsonProperty("openStackId")
-    private String openStackId;
     @JsonProperty("flavor")
     private String flavor;
     @JsonProperty("resources")
@@ -162,14 +160,6 @@ public class NodeRepositoryNode {
         this.additionalHostnames = additionalHostnames;
     }
 
-    public String getOpenStackId() {
-        return openStackId;
-    }
-
-    public void setOpenStackId(String openStackId) {
-        this.openStackId = openStackId;
-    }
-
     public String getFlavor() {
         return flavor;
     }
@@ -348,6 +338,10 @@ public class NodeRepositoryNode {
         return orchestratorStatus;
     }
 
+    public void setOrchestratorStatus(String orchestratorStatus) {
+        this.orchestratorStatus = orchestratorStatus;
+    }
+
     public Long suspendedSinceMillis() {
         return suspendedSinceMillis;
     }
@@ -447,7 +441,6 @@ public class NodeRepositoryNode {
                ", ipAddresses=" + ipAddresses +
                ", additionalIpAddresses=" + additionalIpAddresses +
                ", additionalHostnames=" + additionalHostnames +
-               ", openStackId='" + openStackId + '\'' +
                ", flavor='" + flavor + '\'' +
                ", resources=" + resources +
                ", requestedResources=" + requestedResources +