Remove defaultFlavor from Environment

7 files changed, 0 insertions, 20 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
index 0a05acac6f1..fbd2b6f57a1 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
@@ -49,7 +49,6 @@ public class Environment {
     private final List<String> logstashNodes;
     private final Optional<String> coredumpFeedEndpoint;
     private final NodeType nodeType;
-    private final String defaultFlavor;
     private final String cloud;
     private final ContainerEnvironmentResolver containerEnvironmentResolver;
 
@@ -68,7 +67,6 @@ public class Environment {
              getLogstashNodesFromEnvironment(),
              Optional.of(getEnvironmentVariable(COREDUMP_FEED_ENDPOINT)),
              NodeType.host,
-             "d-2-8-50",
              getEnvironmentVariable(CLOUD),
              new DefaultContainerEnvironmentResolver());
     }
@@ -83,14 +81,12 @@ public class Environment {
                         List<String> logstashNodes,
                         Optional<String> coreDumpFeedEndpoint,
                         NodeType nodeType,
-                        String defaultFlavor,
                         String cloud,
                         ContainerEnvironmentResolver containerEnvironmentResolver) {
         Objects.requireNonNull(configServerConfig, "configServerConfig cannot be null");
         Objects.requireNonNull(environment, "environment cannot be null");
         Objects.requireNonNull(region, "region cannot be null");
         Objects.requireNonNull(system, "system cannot be null");
-        Objects.requireNonNull(defaultFlavor, "default flavor cannot be null");
         Objects.requireNonNull(cloud, "cloud cannot be null");
 
         this.configServerInfo = new ConfigServerInfo(configServerConfig);
@@ -103,7 +99,6 @@ public class Environment {
         this.logstashNodes = logstashNodes;
         this.coredumpFeedEndpoint = coreDumpFeedEndpoint;
         this.nodeType = nodeType;
-        this.defaultFlavor = defaultFlavor;
         this.cloud = cloud;
         this.containerEnvironmentResolver = containerEnvironmentResolver;
     }
@@ -215,8 +210,6 @@ public class Environment {
 
     public NodeType getNodeType() { return nodeType; }
 
-    public String getDefaultFlavor() { return defaultFlavor; }
-
     public String getCloud() { return cloud; }
 
     public ContainerEnvironmentResolver getContainerEnvironmentResolver() {
@@ -238,7 +231,6 @@ public class Environment {
         private List<String> logstashNodes = Collections.emptyList();
         private Optional<String> coredumpFeedEndpoint = Optional.empty();
         private NodeType nodeType = NodeType.tenant;
-        private String defaultFlavor;
         private String cloud;
         private ContainerEnvironmentResolver containerEnvironmentResolver;
 
@@ -297,11 +289,6 @@ public class Environment {
             return this;
         }
 
-        public Builder defaultFlavor(String defaultFlavor) {
-            this.defaultFlavor = defaultFlavor;
-            return this;
-        }
-
         public Builder cloud(String cloud) {
             this.cloud = cloud;
             return this;
@@ -318,7 +305,6 @@ public class Environment {
                                    logstashNodes,
                                    coredumpFeedEndpoint,
                                    nodeType,
-                                   defaultFlavor,
                                    cloud,
                                    Optional.ofNullable(containerEnvironmentResolver).orElseGet(DefaultContainerEnvironmentResolver::new));
         }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
index 357467122cb..e5f35f17aed 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
@@ -34,7 +34,6 @@ public class DockerOperationsImplTest {
             .region("us-east-1")
             .environment("prod")
             .system("main")
-            .defaultFlavor("d-2-8-50")
             .cloud("mycloud")
             .build();
     private final Docker docker = mock(Docker.class);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index da13b19701e..9b9cba9148b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -66,7 +66,6 @@ public class DockerTester implements AutoCloseable {
                 .environment("prod")
                 .system("main")
                 .pathResolver(new PathResolver(pathToVespaHome, Paths.get("/tmp"), Paths.get("/tmp")))
-                .defaultFlavor("d-2-8-50")
                 .cloud("mycloud")
                 .build();
         Clock clock = Clock.systemUTC();
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java
index 87cf6f2b985..6238c13537d 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java
@@ -103,7 +103,6 @@ public class FilebeatConfigProviderTest {
                 .region(region)
                 .system(system)
                 .logstashNodes(logstashNodes)
-                .defaultFlavor("d-2-8-50")
                 .cloud("mycloud")
                 .build();
     }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
index 392091c3a5d..e6a75ac596d 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
@@ -42,7 +42,6 @@ public class StorageMaintainerTest {
             .environment("prod")
             .system("main")
             .pathResolver(new PathResolver())
-            .defaultFlavor("d-2-8-50")
             .cloud("mycloud")
             .build();
     private final DockerOperations docker = mock(DockerOperations.class);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
index 7182f1f7da6..94cfcad1230 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
@@ -90,7 +90,6 @@ public class NodeAgentImplTest {
             .parentHostHostname("parent.host.name.yahoo.com")
             .inetAddressResolver(new InetAddressResolver())
             .pathResolver(pathResolver)
-            .defaultFlavor("d-2-8-50")
             .cloud("mycloud")
             .build();
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java
index d5afd74af66..a3a455605ad 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java
@@ -23,7 +23,6 @@ public class EnvironmentTest {
             .environment("prod")
             .system("main")
             .pathResolver(new PathResolver())
-            .defaultFlavor("d-2-8-50")
             .cloud("mycloud")
             .build();