diff options
Diffstat (limited to 'config-model/src')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/Container.java | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index e098263119c..e444a5db8ac 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -221,10 +221,6 @@ public class Container extends AbstractService implements myServiceType = "qrserver"; return myServiceType; } - if (cluster.getSearch() == null && cluster.getDocproc() != null) { - myServiceType = "docprocservice"; - return myServiceType; - } } myServiceType = super.getServiceType(); return myServiceType; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java index 11abe13712a..e059a673f41 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java @@ -141,7 +141,7 @@ public class IndexedTest extends ContentBaseTest { HostResource h = model.getHostSystem().getHosts().get(0); String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok", "logd", "configproxy","config-sentinel", - "qrserver", "fleetcontroller", "topleveldispatch", "docprocservice", + "qrserver", "fleetcontroller", "topleveldispatch", "storagenode", "searchnode", "distributor", "transactionlogserver"}; // TODO DomContentBuilderTest.assertServices(h, expectedServices); Routing routing = model.getRouting(); |