diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-03-10 09:54:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-10 09:54:27 +0100 |
commit | 28e361815076bc959a639bf0ecb601cc3b43aab8 (patch) | |
tree | 26dbcb0884fc74ebae434617902f00bf655875c4 /configserver | |
parent | 523213c7eb64adccc09a3efb05a8d51fb5dbcd37 (diff) |
Revert "Flavor interface"
Diffstat (limited to 'configserver')
2 files changed, 23 insertions, 26 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java index bfceab782ba..3288b418bb1 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java @@ -2,17 +2,17 @@ package com.yahoo.vespa.config.server; import com.yahoo.cloud.config.ConfigserverConfig; -import com.yahoo.component.Version; import com.yahoo.config.model.application.provider.FilesApplicationPackage; -import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.NodeFlavors; -import com.yahoo.config.provision.internal.ConfigNodeFlavors; +import com.yahoo.component.Version; import com.yahoo.config.provisioning.FlavorsConfig; import com.yahoo.vespa.config.server.application.Application; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.vespa.config.server.application.ApplicationSet; import com.yahoo.vespa.config.server.monitoring.MetricUpdater; import com.yahoo.vespa.curator.mock.MockCurator; import com.yahoo.vespa.model.VespaModel; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -26,11 +26,7 @@ import java.util.Arrays; import java.util.Optional; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * @author Ulf Lilleengen @@ -134,7 +130,7 @@ public class SuperModelRequestHandlerTest { } public static NodeFlavors emptyNodeFlavors() { - return new ConfigNodeFlavors(new FlavorsConfig(new FlavorsConfig.Builder())); + return new NodeFlavors(new FlavorsConfig(new FlavorsConfig.Builder())); } private ApplicationId applicationId(String tenantName, String applicationName) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java index b381ba580bc..e8e2dd07756 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java @@ -1,15 +1,27 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.zookeeper; -import com.yahoo.component.Version; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertThat; + +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.util.Collections; +import java.util.Optional; +import java.util.regex.Pattern; + import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; -import com.yahoo.config.provision.internal.ConfigNodeFlavors; +import com.yahoo.config.provision.NodeFlavors; +import com.yahoo.config.provision.AllocatedHosts; +import com.yahoo.component.Version; import com.yahoo.config.provisioning.FlavorsConfig; -import com.yahoo.io.IOUtils; import com.yahoo.path.Path; import com.yahoo.text.Utf8; import com.yahoo.vespa.curator.mock.MockCurator; @@ -18,18 +30,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.File; -import java.io.IOException; -import java.io.Reader; -import java.util.Collections; -import java.util.Optional; -import java.util.regex.Pattern; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import com.yahoo.io.IOUtils; public class ZKApplicationPackageTest { @@ -92,7 +93,7 @@ public class ZKApplicationPackageTest { zk.putData("/0/" + ZKApplicationPackage.allocatedHostsNode, ALLOCATED_HOSTS.toJson()); } - private static class MockNodeFlavors extends ConfigNodeFlavors { + private static class MockNodeFlavors extends NodeFlavors{ MockNodeFlavors() { super(flavorsConfig()); } |