From 7455ce04b19a0b79ea177cb96c0dc03d1c77c12d Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Sun, 14 Oct 2018 23:27:01 +0200
Subject: [PATCH] Removed dependencies between cta-tape-developer-acs-tools and
cta::exception::QueryVolumeFailed
---
mediachanger/acs/AcsQueryDriveCmd.cpp | 19 +++++++++----------
mediachanger/acs/AcsQueryVolumeCmd.cpp | 19 +++++++++----------
mediachanger/acs/AcsQueryVolumeCmd.hpp | 1 -
mediachanger/acs/CMakeLists.txt | 2 --
4 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/mediachanger/acs/AcsQueryDriveCmd.cpp b/mediachanger/acs/AcsQueryDriveCmd.cpp
index 5aa5985b07..a3150c9fe5 100644
--- a/mediachanger/acs/AcsQueryDriveCmd.cpp
+++ b/mediachanger/acs/AcsQueryDriveCmd.cpp
@@ -19,7 +19,6 @@
#include "AcsQueryDriveCmd.hpp"
#include "AcsQueryDriveCmdLine.hpp"
-#include "common/exception/QueryVolumeFailed.hpp"
#include <getopt.h>
#include <iostream>
#include <string.h>
@@ -84,11 +83,11 @@ void cta::mediachanger::acs::AcsQueryDriveCmd::syncQueryDrive() {
requestResponsesUntilFinal(requestSeqNumber, buf, m_cmdLine.queryInterval,
m_cmdLine.timeout);
processQueryResponse(m_out, buf);
- } catch(cta::exception::Exception &ex) {
- cta::exception::QueryVolumeFailed qf;
- qf.getMessage() << "Failed to query drive " <<
- m_acs.driveId2Str(m_cmdLine.libraryDriveSlot) << ": " << ex.getMessage().str();
- throw qf;
+ } catch(cta::exception::Exception &ne) {
+ cta::exception::Exception ex;
+ ex.getMessage() << "Failed to query drive " <<
+ m_acs.driveId2Str(m_cmdLine.libraryDriveSlot) << ": " << ne.getMessage().str();
+ throw ex;
}
}
@@ -103,7 +102,7 @@ void cta::mediachanger::acs::AcsQueryDriveCmd::sendQueryDriveRequest(
m_dbg << "Acs::queryDrive() returned " << acs_status(s) << std::endl;
if(STATUS_SUCCESS != s) {
- cta::exception::QueryVolumeFailed ex;
+ cta::exception::Exception ex;
ex.getMessage() << "Failed to send query request for drive " <<
m_acs.driveId2Str(m_cmdLine.libraryDriveSlot)<< ": " << acs_status(s);
throw ex;
@@ -120,14 +119,14 @@ void cta::mediachanger::acs::AcsQueryDriveCmd::processQueryResponse(
const ACS_QUERY_DRV_RESPONSE *const msg = (ACS_QUERY_DRV_RESPONSE *)buf;
if(STATUS_SUCCESS != msg->query_drv_status) {
- cta::exception::QueryVolumeFailed ex;
+ cta::exception::Exception ex;
ex.getMessage() << "Status of query response is not success: " <<
acs_status(msg->query_drv_status);
throw ex;
}
if((unsigned short)1 != msg->count) {
- cta::exception::QueryVolumeFailed ex;
+ cta::exception::Exception ex;
ex.getMessage() << "Query response does not contain a single drive: count="
<< msg->count;
throw ex;
@@ -137,7 +136,7 @@ void cta::mediachanger::acs::AcsQueryDriveCmd::processQueryResponse(
const QU_DRV_STATUS &drvStatus = msg->drv_status[0];
if(m_acs.driveId2Str(m_cmdLine.libraryDriveSlot)!= m_acs.driveId2Str(drvStatus.drive_id)) {
- cta::exception::QueryVolumeFailed ex;
+ cta::exception::Exception ex;
ex.getMessage() <<
"Drive identifier of query response does not match that of request"
" requestDriveID=" <<m_acs.driveId2Str(m_cmdLine.libraryDriveSlot) <<
diff --git a/mediachanger/acs/AcsQueryVolumeCmd.cpp b/mediachanger/acs/AcsQueryVolumeCmd.cpp
index 68ad5de8b2..9384ed5194 100644
--- a/mediachanger/acs/AcsQueryVolumeCmd.cpp
+++ b/mediachanger/acs/AcsQueryVolumeCmd.cpp
@@ -19,7 +19,6 @@
#include "AcsQueryVolumeCmd.hpp"
#include "AcsQueryVolumeCmdLine.hpp"
-#include "common/exception/QueryVolumeFailed.hpp"
#include <getopt.h>
#include <iostream>
#include <string.h>
@@ -84,11 +83,11 @@ void cta::mediachanger::acs::AcsQueryVolumeCmd::syncQueryVolume() {
requestResponsesUntilFinal(requestSeqNumber, buf, m_cmdLine.queryInterval,
m_cmdLine.timeout);
processQueryResponse(m_out, buf);
- } catch(cta::exception::Exception &ex) {
- cta::exception::QueryVolumeFailed qf;
- qf.getMessage() << "Failed to query volume " <<
- m_cmdLine.volId.external_label << ": " << ex.getMessage().str();
- throw qf;
+ } catch(cta::exception::Exception &ne) {
+ cta::exception::Exception ex;
+ ex.getMessage() << "Failed to query volume " <<
+ m_cmdLine.volId.external_label << ": " << ne.getMessage().str();
+ throw ex;
}
}
@@ -109,7 +108,7 @@ void cta::mediachanger::acs::AcsQueryVolumeCmd::sendQueryVolumeRequest(
m_dbg << "Acs::queryVolume() returned " << acs_status(s) << std::endl;
if(STATUS_SUCCESS != s) {
- cta::exception::QueryVolumeFailed ex;
+ cta::exception::Exception ex;
ex.getMessage() << "Failed to send query request for volume " <<
m_cmdLine.volId.external_label << ": " << acs_status(s);
throw ex;
@@ -126,14 +125,14 @@ void cta::mediachanger::acs::AcsQueryVolumeCmd::processQueryResponse(
const ACS_QUERY_VOL_RESPONSE *const msg = (ACS_QUERY_VOL_RESPONSE *)buf;
if(STATUS_SUCCESS != msg->query_vol_status) {
- cta::exception::QueryVolumeFailed ex;
+ cta::exception::Exception ex;
ex.getMessage() << "Status of query response is not success: " <<
acs_status(msg->query_vol_status);
throw ex;
}
if((unsigned short)1 != msg->count) {
- cta::exception::QueryVolumeFailed ex;
+ cta::exception::Exception ex;
ex.getMessage() << "Query response does not contain a single volume: count="
<< msg->count;
throw ex;
@@ -143,7 +142,7 @@ void cta::mediachanger::acs::AcsQueryVolumeCmd::processQueryResponse(
const QU_VOL_STATUS &volStatus = msg->vol_status[0];
if(strcmp(m_cmdLine.volId.external_label, volStatus.vol_id.external_label)) {
- cta::exception::QueryVolumeFailed ex;
+ cta::exception::Exception ex;
ex.getMessage() <<
"Volume identifier of query response does not match that of request"
": requestVID=" << m_cmdLine.volId.external_label <<
diff --git a/mediachanger/acs/AcsQueryVolumeCmd.hpp b/mediachanger/acs/AcsQueryVolumeCmd.hpp
index dda0aa4824..6c83558ba5 100644
--- a/mediachanger/acs/AcsQueryVolumeCmd.hpp
+++ b/mediachanger/acs/AcsQueryVolumeCmd.hpp
@@ -21,7 +21,6 @@
#include "AcsCmd.hpp"
#include "AcsQueryVolumeCmdLine.hpp"
#include "common/exception/MissingOperand.hpp"
-#include "common/exception/QueryVolumeFailed.hpp"
#include <stdint.h>
diff --git a/mediachanger/acs/CMakeLists.txt b/mediachanger/acs/CMakeLists.txt
index cd10186f6c..20aa23f3a0 100644
--- a/mediachanger/acs/CMakeLists.txt
+++ b/mediachanger/acs/CMakeLists.txt
@@ -128,7 +128,6 @@ set (ACS_QUERYVOLUME_SRC_FILES
../../common/exception/Exception.cpp
../../common/exception/Mismatch.cpp
../../common/exception/MissingOperand.cpp
- ../../common/exception/QueryVolumeFailed.cpp
../../common/exception/RequestFailed.cpp
Acs.cpp
AcsCmd.cpp
@@ -159,7 +158,6 @@ set (ACS_QUERYDRIVE_SRC_FILES
../../common/exception/Exception.cpp
../../common/exception/Mismatch.cpp
../../common/exception/MissingOperand.cpp
- ../../common/exception/QueryVolumeFailed.cpp
../../common/exception/RequestFailed.cpp
Acs.cpp
AcsCmd.cpp
--
GitLab