Remove unused reporters from host info (cpu, disk, memory, network).

6 files changed, 1 insertions, 159 deletions

diff --git a/storage/src/tests/common/hostreporter/CMakeLists.txt b/storage/src/tests/common/hostreporter/CMakeLists.txt
index 11a4c0f3f0b..bfc49299186 100644
--- a/storage/src/tests/common/hostreporter/CMakeLists.txt
+++ b/storage/src/tests/common/hostreporter/CMakeLists.txt
@@ -1,11 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_testhostreporter TEST
     SOURCES
-    cpureportertest.cpp
-    diskreportertest.cpp
     hostinfotest.cpp
-    memreportertest.cpp
-    networkreportertest.cpp
     util.cpp
     versionreportertest.cpp
     DEPENDS
diff --git a/storage/src/tests/common/hostreporter/cpureportertest.cpp b/storage/src/tests/common/hostreporter/cpureportertest.cpp
deleted file mode 100644
index 150362a91ba..00000000000
--- a/storage/src/tests/common/hostreporter/cpureportertest.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-#include <vespa/storage/common/hostreporter/cpureporter.h>
-#include <vespa/vdstestlib/cppunit/macros.h>
-#include <vespa/vespalib/data/slime/slime.h>
-#include <vespa/vespalib/util/jsonstream.h>
-#include "util.h"
-
-LOG_SETUP(".test.cpureporter");
-
-namespace storage {
-namespace {
-using Object = vespalib::JsonStream::Object;
-using End = vespalib::JsonStream::End;
-}
-
-struct CpuReporterTest : public CppUnit::TestFixture
-{
-    void testCpuReporter();
-
-    CPPUNIT_TEST_SUITE(CpuReporterTest);
-    CPPUNIT_TEST(testCpuReporter);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(CpuReporterTest);
-
-void
-CpuReporterTest::testCpuReporter()
-{
-    CpuReporter cpuReporter;
-    vespalib::Slime slime;
-    util::reporterToSlime(cpuReporter,  slime);
-    CPPUNIT_ASSERT(1.0 <= slime.get()["cpu"]["context switches"].asDouble());
-    CPPUNIT_ASSERT(1.0 <= slime.get()["cpu"]["cputotal"]["user"].asDouble());
-    CPPUNIT_ASSERT(1.0 <= slime.get()["cpu"]["cputotal"]["user"].asDouble());
-    CPPUNIT_ASSERT(1.0 <= slime.get()["cpu"]["cputotal"]["user"].asDouble());
-}
-} // storage
diff --git a/storage/src/tests/common/hostreporter/diskreportertest.cpp b/storage/src/tests/common/hostreporter/diskreportertest.cpp
deleted file mode 100644
index 373e35caae4..00000000000
--- a/storage/src/tests/common/hostreporter/diskreportertest.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-#include <vespa/storage/common/hostreporter/diskreporter.h>
-#include <vespa/vdstestlib/cppunit/macros.h>
-#include <vespa/vespalib/data/slime/slime.h>
-#include <vespa/vespalib/util/jsonstream.h>
-#include "util.h"
-
-LOG_SETUP(".test.diskreporter");
-
-namespace storage {
-
-struct DiskReporterTest : public CppUnit::TestFixture
-{
-    void testDiskReporter();
-
-    CPPUNIT_TEST_SUITE(DiskReporterTest);
-    CPPUNIT_TEST(testDiskReporter);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(DiskReporterTest);
-
-void
-DiskReporterTest::testDiskReporter()
-{
-    DiskReporter diskReporter;
-    vespalib::Slime slime;
-    util::reporterToSlime(diskReporter,  slime);
-    CPPUNIT_ASSERT(0 < slime.get()["disk"].toString().size());
-}
-} // storage
diff --git a/storage/src/tests/common/hostreporter/hostinfotest.cpp b/storage/src/tests/common/hostreporter/hostinfotest.cpp
index 9869970c443..418884c2a38 100644
--- a/storage/src/tests/common/hostreporter/hostinfotest.cpp
+++ b/storage/src/tests/common/hostreporter/hostinfotest.cpp
@@ -51,8 +51,7 @@ HostInfoReporterTest::testHostInfoReporter()
     vespalib::Slime slime;
     JsonFormat::decode(Memory(jsonData), slime);
     CPPUNIT_ASSERT(slime.get()["dummy"]["foo"].asString() == "bar");
-    CPPUNIT_ASSERT(0 < slime.get()["network"]["lo"]["input"]["packets"].asLong());
-    CPPUNIT_ASSERT(1.0 <= slime.get()["cpu"]["context switches"].asDouble());
+    CPPUNIT_ASSERT(!slime.get()["vtag"]["version"].asString().make_string().empty());
 }
 } // storage
 
diff --git a/storage/src/tests/common/hostreporter/memreportertest.cpp b/storage/src/tests/common/hostreporter/memreportertest.cpp
deleted file mode 100644
index 541ec52ed5a..00000000000
--- a/storage/src/tests/common/hostreporter/memreportertest.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-#include <vespa/storage/common/hostreporter/memreporter.h>
-#include <vespa/vdstestlib/cppunit/macros.h>
-#include <vespa/vespalib/data/slime/slime.h>
-#include <vespa/vespalib/util/jsonstream.h>
-#include "util.h"
-
-LOG_SETUP(".test.memreporter");
-
-namespace storage {
-namespace {
-using Object = vespalib::JsonStream::Object;
-using End = vespalib::JsonStream::End;
-}
-
-struct MemReporterTest : public CppUnit::TestFixture
-{
-    void testMemReporter();
-
-    CPPUNIT_TEST_SUITE(MemReporterTest);
-    CPPUNIT_TEST(testMemReporter);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(MemReporterTest);
-
-void
-MemReporterTest::testMemReporter()
-{
-    MemReporter  memReporter;
-    vespalib::Slime slime;
-    util::reporterToSlime(memReporter,  slime);
-    CPPUNIT_ASSERT(0 < slime.get()["memory"]["total memory"].asLong());
-    CPPUNIT_ASSERT(0 < slime.get()["memory"]["free memory"].asLong());
-    CPPUNIT_ASSERT(0 < slime.get()["memory"]["disk cache"].asLong());
-    CPPUNIT_ASSERT(0 < slime.get()["memory"]["active memory"].asLong());
-    CPPUNIT_ASSERT(0 < slime.get()["memory"]["inactive memory"].asLong());
-    CPPUNIT_ASSERT(0 <= slime.get()["memory"]["swap total"].asLong());
-    CPPUNIT_ASSERT(0 <= slime.get()["memory"]["swap free"].asLong());
-    CPPUNIT_ASSERT(0 < slime.get()["memory"]["dirty"].asLong());
-}
-} // storage
diff --git a/storage/src/tests/common/hostreporter/networkreportertest.cpp b/storage/src/tests/common/hostreporter/networkreportertest.cpp
deleted file mode 100644
index 192da3262ed..00000000000
--- a/storage/src/tests/common/hostreporter/networkreportertest.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-#include <vespa/storage/common/hostreporter/networkreporter.h>
-#include <vespa/vdstestlib/cppunit/macros.h>
-#include <vespa/vespalib/data/slime/slime.h>
-#include <vespa/vespalib/util/jsonstream.h>
-#include "util.h"
-
-LOG_SETUP(".test.networkreporter");
-
-namespace storage {
-namespace {
-using Object = vespalib::JsonStream::Object;
-using End = vespalib::JsonStream::End;
-}
-
-struct NetworkReporterTest : public CppUnit::TestFixture
-{
-    void testNetworkReporter();
-
-    CPPUNIT_TEST_SUITE(NetworkReporterTest);
-    CPPUNIT_TEST(testNetworkReporter);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(NetworkReporterTest);
-
-void
-NetworkReporterTest::testNetworkReporter()
-{
-    NetworkReporter networkReporter;
-    vespalib::Slime slime;
-    util::reporterToSlime(networkReporter,  slime);
-    CPPUNIT_ASSERT(0 < slime.get()["network"]["lo"]["input"]["bytes"].asLong());
-    CPPUNIT_ASSERT(0 < slime.get()["network"]["lo"]["input"]["packets"].asLong());
-    CPPUNIT_ASSERT(0 < slime.get()["network"]["lo"]["output"]["bytes"].asLong());
-    CPPUNIT_ASSERT(0 < slime.get()["network"]["lo"]["output"]["packets"].asLong());
-}
-} // storage