summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorgjoranv <gv@yahoo-inc.com>2017-06-08 14:24:31 +0200
committergjoranv <gv@yahoo-inc.com>2017-06-08 14:24:31 +0200
commit3944ddeedb93361304414a918ff7495bf3b8d971 (patch)
treeab6a164726797f3fdda7e23021c43899b62bdc7e /node-repository
parent25809a32e2a9227d92e355483984e9ba592358f4 (diff)
Add a Zone component to services config.
- All components that take config must now be set up explicitly in services.xml, because the default constructor in config classes has been removed.
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java
index d383e90d184..b01949f4d8f 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java
@@ -9,7 +9,7 @@ package com.yahoo.vespa.hosted.provision.testutils;
*/
public class ContainerConfig {
- public static final String servicesXmlV2(int port) {
+ public static String servicesXmlV2(int port) {
return
"<jdisc version='1.0'>" +
" <component id='com.yahoo.test.ManualClock'/>" +
@@ -21,6 +21,7 @@ public class ContainerConfig {
" <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeFlavors'/>" +
" <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeRepository'/>" +
" <component id='com.yahoo.vespa.hosted.provision.maintenance.NodeRepositoryMaintenance'/>" +
+ " <component id='com.yahoo.config.provision.Zone'/>" +
" <handler id='com.yahoo.vespa.hosted.provision.restapi.v2.NodesApiHandler'>" +
" <binding>http://*/nodes/v2/*</binding>" +
" </handler>" +