Remove topleveldispatch remnants

2 files changed, 19 insertions, 32 deletions

diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp
index 415edf6defc..254fa94a8ec 100644
--- a/configutil/src/lib/configstatus.cpp
+++ b/configutil/src/lib/configstatus.cpp
@@ -165,7 +165,6 @@ ConfigStatus::action()
 
                     if (!upToDate) {
                         if (svc.type == "searchnode" ||
-                            svc.type == "topleveldispatch" ||
                             svc.type == "logd")
                         {
                             std::cerr << "[generation not up-to-date ignored]" << std::endl;
diff --git a/configutil/src/tests/model_inspect/model.cfg b/configutil/src/tests/model_inspect/model.cfg
index 388bae2256d..bc29226e494 100644
--- a/configutil/src/tests/model_inspect/model.cfg
+++ b/configutil/src/tests/model_inspect/model.cfg
@@ -115,35 +115,23 @@ hosts[0].services[11].ports[0].number 19106
 hosts[0].services[11].ports[0].tags "status admin rpc rtx"
 hosts[0].services[11].ports[1].number 19107
 hosts[0].services[11].ports[1].tags "unused"
-hosts[0].services[12].name "topleveldispatch"
-hosts[0].services[12].type "topleveldispatch"
-hosts[0].services[12].configid "search/cluster.music/tlds/tld.0"
-hosts[0].services[12].clustertype "search"
-hosts[0].services[12].clustername "music"
+hosts[0].services[12].name "docprocservice"
+hosts[0].services[12].type "container"
+hosts[0].services[12].configid "docproc/cluster.music.indexing/0"
+hosts[0].services[12].clustertype ""
+hosts[0].services[12].clustername "music.indexing"
 hosts[0].services[12].index 0
-hosts[0].services[12].ports[0].number 19108
-hosts[0].services[12].ports[0].tags "admin rpc"
-hosts[0].services[12].ports[1].number 19109
-hosts[0].services[12].ports[1].tags "fs4"
-hosts[0].services[12].ports[2].number 19110
-hosts[0].services[12].ports[2].tags "health json http"
-hosts[0].services[13].name "docprocservice"
-hosts[0].services[13].type "container"
-hosts[0].services[13].configid "docproc/cluster.music.indexing/0"
-hosts[0].services[13].clustertype ""
-hosts[0].services[13].clustername "music.indexing"
-hosts[0].services[13].index 0
-hosts[0].services[13].ports[0].number 19111
-hosts[0].services[13].ports[0].tags "state external query http"
-hosts[0].services[13].ports[1].number 19112
-hosts[0].services[13].ports[1].tags "external status http"
-hosts[0].services[13].ports[2].number 19113
-hosts[0].services[13].ports[2].tags "messaging rpc"
-hosts[0].services[13].ports[3].number 19114
-hosts[0].services[13].ports[3].tags "external fileserver http"
-hosts[0].services[13].ports[4].number 19115
-hosts[0].services[13].ports[4].tags "admin rpc"
-hosts[0].services[13].ports[5].number 19116
-hosts[0].services[13].ports[5].tags "rmiregistry rmi"
-hosts[0].services[13].ports[6].number 19117
-hosts[0].services[13].ports[6].tags "jmx rmi"
+hosts[0].services[12].ports[0].number 19111
+hosts[0].services[12].ports[0].tags "state external query http"
+hosts[0].services[12].ports[1].number 19112
+hosts[0].services[12].ports[1].tags "external status http"
+hosts[0].services[12].ports[2].number 19113
+hosts[0].services[12].ports[2].tags "messaging rpc"
+hosts[0].services[12].ports[3].number 19114
+hosts[0].services[12].ports[3].tags "external fileserver http"
+hosts[0].services[12].ports[4].number 19115
+hosts[0].services[12].ports[4].tags "admin rpc"
+hosts[0].services[12].ports[5].number 19116
+hosts[0].services[12].ports[5].tags "rmiregistry rmi"
+hosts[0].services[12].ports[6].number 19117
+hosts[0].services[12].ports[6].tags "jmx rmi"