Commit 9f9de3eb authored by Daniele Kruse's avatar Daniele Kruse
Browse files

Linked the scheduler with the catalogue

parent d232a1ac
......@@ -118,7 +118,6 @@ public:
virtual std::list<cta::common::dataStructures::Tape> getTapes(const cta::common::dataStructures::SecurityIdentity &requester,
const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue) = 0;
virtual void labelTape(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const bool force, const bool lbp, const std::string &tag) = 0;
virtual void reclaimTape(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid) = 0;
virtual void modifyTapeLogicalLibraryName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &logicalLibraryName) = 0;
virtual void modifyTapeTapePoolName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tapePoolName) = 0;
......
......@@ -183,11 +183,6 @@ std::list<cta::common::dataStructures::Tape> cta::catalogue::DummyCatalogue::get
const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue) { return std::list<cta::common::dataStructures::Tape>();}
//------------------------------------------------------------------------------
// labelTape
//------------------------------------------------------------------------------
void cta::catalogue::DummyCatalogue::labelTape(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const bool force, const bool lbp, const std::string &tag) {}
//------------------------------------------------------------------------------
// reclaimTape
//------------------------------------------------------------------------------
......
......@@ -75,7 +75,6 @@ public:
virtual std::list<cta::common::dataStructures::Tape> getTapes(const cta::common::dataStructures::SecurityIdentity &requester,
const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue);
virtual void labelTape(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const bool force, const bool lbp, const std::string &tag);
virtual void reclaimTape(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid);
virtual void modifyTapeLogicalLibraryName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &logicalLibraryName);
virtual void modifyTapeTapePoolName(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tapePoolName);
......
......@@ -39,7 +39,6 @@ virtual void createTape
virtual void deleteTape (const SecurityIdentity &requester, const std::string &vid);
virtual std::list<Tape> getTapes (const SecurityIdentity &requester, const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue);
virtual void labelTape (const SecurityIdentity &requester, const std::string &vid, const bool force, const bool lbp, const std::string &tag);
virtual void reclaimTape (const SecurityIdentity &requester, const std::string &vid);
virtual void modifyTapeLogicalLibraryName (const SecurityIdentity &requester, const std::string &vid, const std::string &logicalLibraryName);
virtual void modifyTapeTapePoolName (const SecurityIdentity &requester, const std::string &vid, const std::string &tapePoolName);
......
This diff is collapsed.
......@@ -81,18 +81,13 @@ class Scheduler {
public:
/**
* Deprecated Constructor.
* Constructor.
*/
Scheduler(
cta::catalogue::Catalogue &catalogue,
NameServer &ns,
SchedulerDatabase &db,
RemoteNS &remoteNS);
/**
* Constructor.
*/
Scheduler();
/**
* Destructor.
......@@ -234,6 +229,7 @@ public:
private:
cta::catalogue::Catalogue &m_catalogue;
}; // class Scheduler
} // namespace cta
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment