From 6cc9ca39379fbd9baf3cb01ef1f2b2cd85a51ed9 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@oath.com>
Date: Thu, 22 Feb 2018 12:48:47 +0000
Subject: Add cluster state bundle which contains a baseline cluster state and
 (later) a derived cluster state for each bucket space.

---
 storage/src/tests/storageserver/statemanagertest.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'storage/src/tests/storageserver/statemanagertest.cpp')

diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp
index c07c150a520..0676d3684ff 100644
--- a/storage/src/tests/storageserver/statemanagertest.cpp
+++ b/storage/src/tests/storageserver/statemanagertest.cpp
@@ -4,6 +4,7 @@
 #include <vespa/metrics/metricmanager.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/state.h>
+#include <vespa/storage/common/cluster_state_bundle.h>
 #include <vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h>
 #include <vespa/storage/storageserver/statemanager.h>
 #include <tests/common/teststorageapp.h>
@@ -105,7 +106,7 @@ StateManagerTest::testSystemState()
 {
     std::shared_ptr<api::StorageReply> reply;
         // Verify initial state on startup
-    ClusterState::CSP currentState = _manager->getSystemState();
+    ClusterState::CSP currentState = _manager->getClusterStateBundle()->getBaselineClusterState();
     CPPUNIT_ASSERT_EQUAL(std::string("cluster:d"),
                          currentState->toString(false));
 
@@ -118,7 +119,7 @@ StateManagerTest::testSystemState()
     _upper->sendDown(cmd);
     GET_ONLY_OK_REPLY(reply);
 
-    currentState = _manager->getSystemState();
+    currentState = _manager->getClusterStateBundle()->getBaselineClusterState();
     CPPUNIT_ASSERT_EQUAL(sendState, *currentState);
 
     currentNodeState = _manager->getCurrentNodeState();
@@ -225,7 +226,7 @@ StateManagerTest::testReportedNodeState()
 void
 StateManagerTest::testClusterStateVersion()
 {
-    ClusterState state(*_manager->getSystemState());
+    ClusterState state(*_manager->getClusterStateBundle()->getBaselineClusterState());
     state.setVersion(123);
     _manager->setClusterState(state);
 
-- 
cgit v1.2.3