diff options
Diffstat (limited to 'config-model/src/test/cfg')
9 files changed, 13 insertions, 199 deletions
diff --git a/config-model/src/test/cfg/admin/metricconfig/services.xml b/config-model/src/test/cfg/admin/metricconfig/services.xml index a2a03ca0b08..b4858b1b1bf 100644 --- a/config-model/src/test/cfg/admin/metricconfig/services.xml +++ b/config-model/src/test/cfg/admin/metricconfig/services.xml @@ -5,20 +5,20 @@ <adminserver hostalias="node1"/> <logserver hostalias="node1"/> <monitoring interval="60"/> - <metric-consumers> - <consumer name="fooConsumer"> - <metric name="some.foo.metric" output-name="someFooMetric"/> - <metric name="some.foo.metric2" output-name="someFooMetric2"/> - <metric name="proton.numdocs.average" output-name="tull"/> + <metrics> + <consumer id="fooConsumer"> + <metric id="some.foo.metric" display-name="someFooMetric"/> + <metric id="some.foo.metric2" display-name="someFooMetric2"/> + <metric id="proton.numdocs.average" display-name="tull"/> </consumer> - <consumer name="fooConsumer2"> - <metric name="some.foo.metric3" output-name="someFooMetric3"/> + <consumer id="fooConsumer2"> + <metric id="some.foo.metric3" display-name="someFooMetric3"/> </consumer> - <consumer name="yamas"> - <metric name="vds.distributor.bytesstored.average" output-name="tullball"/> - <metric name="proton.numdocs.average" output-name="overridden"/> + <consumer id="yamas"> + <metric id="vds.distributor.bytesstored.average" display-name="tullball"/> + <metric id="proton.numdocs.average" display-name="overridden"/> </consumer> - </metric-consumers> + </metrics> </admin> <container version="1.0"> diff --git a/config-model/src/test/cfg/application/metricsconfig/services.xml b/config-model/src/test/cfg/application/metricsconfig/services.xml index 868173bc00e..fc3c6e8ce06 100644 --- a/config-model/src/test/cfg/application/metricsconfig/services.xml +++ b/config-model/src/test/cfg/application/metricsconfig/services.xml @@ -3,20 +3,7 @@ <services> <simple version="1.0"> - <simpleservice hostalias="host2"> - <metric-consumers> - <consumer name="yamas"> - <metric name="onlyMine" output-name="user"/> - </consumer> - </metric-consumers> - </simpleservice> - - <simpleservice hostalias="host2"> - <metric-consumers> - <consumer name="yamas"> - <metric name="test" output-name="user"/> - </consumer> - </metric-consumers> - </simpleservice> + <simpleservice hostalias="host2" /> + <simpleservice hostalias="host2" /> </simple> </services> diff --git a/config-model/src/test/cfg/clients/advancedconfig.v2/hosts.xml b/config-model/src/test/cfg/clients/advancedconfig.v2/hosts.xml deleted file mode 100644 index 9eafb2106cb..00000000000 --- a/config-model/src/test/cfg/clients/advancedconfig.v2/hosts.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<hosts> - <host name="localhost"> - <alias>node1</alias> - </host> -</hosts> diff --git a/config-model/src/test/cfg/clients/advancedconfig.v2/searchdefinitions/music.sd b/config-model/src/test/cfg/clients/advancedconfig.v2/searchdefinitions/music.sd deleted file mode 100644 index da9e2d14c55..00000000000 --- a/config-model/src/test/cfg/clients/advancedconfig.v2/searchdefinitions/music.sd +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -search music { - document music { - field f1 type string { - indexing: summary | index - # index-to: f1, all - } - field f2 type string { - indexing: summary | index - # index-to: f2, all - } - } -} diff --git a/config-model/src/test/cfg/clients/advancedconfig.v2/services.xml b/config-model/src/test/cfg/clients/advancedconfig.v2/services.xml deleted file mode 100644 index e6102b6f8fd..00000000000 --- a/config-model/src/test/cfg/clients/advancedconfig.v2/services.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services xmlns=""> - <admin version="2.0"> - <adminserver hostalias="node1" /> - <logserver hostalias="node1" /> - <slobroks> - <slobrok hostalias="node1" /> - </slobroks> - </admin> - - <clients version="2.0"> - <spoolers> - <feederoptions> - <timeout>90</timeout> - </feederoptions> - - <spooler hostalias="node1" keepsuccess="true"> - <abortondocumenterror>false</abortondocumenterror> - <maxpendingbytes>8000</maxpendingbytes> - <parsers> - <parser type="com.yahoo.vespaspooler.XMLFileParser"/> - <parser type="com.yahoo.vespaspooler.MusicFileParser"/> - <parser type="com.yahoo.vespaspooler.MusicParser"> - <parameter key="route" value="default"/> - </parser> - </parsers> - </spooler> - - <spooler hostalias="node1"> - <abortondocumenterror>false</abortondocumenterror> - <maxpendingbytes>4000</maxpendingbytes> - <timeout>50</timeout> - <parsers> - <parser type="com.yahoo.vespaspooler.MusicParser"> - <parameter key="route" value="othercluster"/> - </parser> - </parsers> - </spooler> - - <spooler id="plan9"> - <route>myroute</route> - <mbusport>14064</mbusport> - - <parsers> - <parser type="com.yahoo.vespaspooler.MusicFileParser" /> - </parsers> - </spooler> - - </spoolers> - </clients> - - <container version="1.0"> - <search/> - <nodes> - <node hostalias="node1"/> - </nodes> - </container> - - <content version="1.0" id="music"> - <redundancy>2</redundancy> - <documents> - <document type="music" mode="index"/> - </documents> - <nodes> - <node hostalias="node1" distribution-key="0" /> - </nodes> - </content> - -</services> diff --git a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/hosts.xml b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/hosts.xml deleted file mode 100644 index 9eafb2106cb..00000000000 --- a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/hosts.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<hosts> - <host name="localhost"> - <alias>node1</alias> - </host> -</hosts> diff --git a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/searchdefinitions/music.sd b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/searchdefinitions/music.sd deleted file mode 100644 index da9e2d14c55..00000000000 --- a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/searchdefinitions/music.sd +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -search music { - document music { - field f1 type string { - indexing: summary | index - # index-to: f1, all - } - field f2 type string { - indexing: summary | index - # index-to: f2, all - } - } -} diff --git a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/services.xml b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/services.xml deleted file mode 100644 index ded66571026..00000000000 --- a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/services.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services> - - <admin version="2.0"> - <adminserver hostalias="node1" /> - <logserver hostalias="node1" /> - <slobroks> - <slobrok hostalias="node1" /> - </slobroks> - </admin> - - <clients version="2.0"> - <spoolers> - <spooler hostalias="node1" maxfailuresize="100000" maxfatalfailuresize="1000000" threads="5"> - <abortondocumenterror>false</abortondocumenterror> - <maxpendingbytes>8000</maxpendingbytes> - <tracelevel>7</tracelevel> - <parsers> - <parser type="com.yahoo.vespaspooler.XMLFileParser"/> - <parser type="com.yahoo.vespaspooler.MusicFileParser"/> - <parser type="com.yahoo.vespaspooler.MusicParser"> - <parameter key="route" value="default"/> - <parameter key="foo" value="bar"/> - </parser> - </parsers> - </spooler> - </spoolers> - </clients> - - <container version="1.0"> - - <nodes> - <node hostalias="node1"/> - </nodes> - - <document-api/> - - <document-processing> - <chain id="main"> - <documentprocessor id="com.yahoo.docprocs.FoobarDocumentProcessor" /> - </chain> - </document-processing> - - <search/> - - </container> - - <content version="1.0" id="music"> - - <redundancy>2</redundancy> - - <documents> - <document type="music" mode="index"/> - </documents> - - <nodes> - <node hostalias="node1" distribution-key="0" /> - </nodes> - - </content> - -</services> diff --git a/config-model/src/test/cfg/clients/simpleconfig.v2/searchdefinitions/.gitignore b/config-model/src/test/cfg/clients/simpleconfig.v2/searchdefinitions/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 --- a/config-model/src/test/cfg/clients/simpleconfig.v2/searchdefinitions/.gitignore +++ /dev/null |