diff --git a/xroot_plugins/XrdCtaFilesystem.cpp b/xroot_plugins/XrdCtaFilesystem.cpp index 4349f125fb9188cc094384d38400530f81411847..0a8c948d36c0167db19445d1cb21e7c0b48b3fc0 100644 --- a/xroot_plugins/XrdCtaFilesystem.cpp +++ b/xroot_plugins/XrdCtaFilesystem.cpp @@ -39,6 +39,7 @@ #include "XrdVersion.hh" #include "xroot_plugins/XrdCtaFilesystem.hpp" #include "xroot_plugins/XrdCtaFile.hpp" +#include "common/Configuration.hpp" #include <memory> #include <iostream> @@ -257,10 +258,8 @@ void XrdCtaFilesystem::EnvInfo(XrdOucEnv *envP) // constructor //------------------------------------------------------------------------------ XrdCtaFilesystem::XrdCtaFilesystem(): - m_remoteStorage(castor::common::CastorConfiguration::getConfig().getConfEntString("TapeServer", "EOSRemoteHostAndPort")), - m_backend(cta::objectstore::BackendFactory::createBackend( - castor::common::CastorConfiguration::getConfig().getConfEntString("TapeServer", "ObjectStoreBackendPath")) - .release()), + m_ctaConf(), + m_backend(cta::objectstore::BackendFactory::createBackend(m_ctaConf.getConfEntString("ObjectStore", "ObjectStoreBackendPath", NULL)).release()), m_backendPopulator(*m_backend), m_scheddb(*m_backend, m_backendPopulator.getAgent()) { using namespace cta; diff --git a/xroot_plugins/XrdCtaFilesystem.hpp b/xroot_plugins/XrdCtaFilesystem.hpp index f336705ed252cf1454ae2e09e087e91e40bfe914..1a1d462a6bd53bc54d9b1d22799c95490532f972 100644 --- a/xroot_plugins/XrdCtaFilesystem.hpp +++ b/xroot_plugins/XrdCtaFilesystem.hpp @@ -19,6 +19,7 @@ #pragma once #include "catalogue/Catalogue.hpp" +#include "common/Configuration.hpp" #include "nameserver/mockNS/MockNameServer.hpp" #include "objectstore/BackendPopulator.hpp" #include "objectstore/BackendVFS.hpp" @@ -65,14 +66,9 @@ public: protected: /** - * The CTA nameserver + * The CTA configuration */ - cta::MockNameServer m_ns; - - /** - * The remote file storage system (typically EOS) - */ - cta::EosNS m_remoteStorage; + cta::common::Configuration m_ctaConf; /** * The VFS backend for the objectstore DB