summaryrefslogtreecommitdiffstats
path: root/service-monitor
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-04-30 17:24:53 +0200
committerValerij Fredriksen <valerijf@oath.com>2018-05-04 11:48:49 +0200
commit1c512129bc54cabe2096ad3615995ba8bca0caf0 (patch)
treeb8420e685fe197821970ef63975ffd8cf9ccd8a3 /service-monitor
parent21487aff7d511fb9d118228de97252571208b5e9 (diff)
Do not set cluster group
Diffstat (limited to 'service-monitor')
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java12
1 files changed, 3 insertions, 9 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java
index 55965705567..d1111bdd5d7 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java
@@ -19,21 +19,19 @@ public abstract class HostedVespaApplication {
private final Capacity capacity;
private final ClusterSpec.Type clusterType;
private final ClusterSpec.Id clusterId;
- private final ClusterSpec.Group clusterGroup;
protected HostedVespaApplication(String applicationName, NodeType nodeType,
ClusterSpec.Type clusterType, ClusterSpec.Id clusterId) {
this(createHostedVespaApplicationId(applicationName), Capacity.fromRequiredNodeType(nodeType),
- clusterType, clusterId, ClusterSpec.Group.from(0));
+ clusterType, clusterId);
}
protected HostedVespaApplication(ApplicationId applicationId, Capacity capacity,
- ClusterSpec.Type clusterType, ClusterSpec.Id clusterId, ClusterSpec.Group clusterGroup) {
+ ClusterSpec.Type clusterType, ClusterSpec.Id clusterId) {
this.applicationId = applicationId;
this.capacity = capacity;
this.clusterType = clusterType;
this.clusterId = clusterId;
- this.clusterGroup = clusterGroup;
}
public ApplicationId getApplicationId() {
@@ -45,7 +43,7 @@ public abstract class HostedVespaApplication {
}
public ClusterSpec getClusterSpecWithVersion(Version version) {
- return ClusterSpec.from(clusterType, clusterId, clusterGroup, version, true);
+ return ClusterSpec.request(clusterType, clusterId, version, true);
}
public ClusterSpec.Type getClusterType() {
@@ -56,10 +54,6 @@ public abstract class HostedVespaApplication {
return clusterId;
}
- public ClusterSpec.Group getClusterGroup() {
- return clusterGroup;
- }
-
public static ApplicationId createHostedVespaApplicationId(String applicationName) {
return new ApplicationId.Builder()
.tenant(TENANT_NAME)