[eos_cta] Adds report_url to Protocol Buffer

cmdline/EosCtaStub.cpp

@@ -223,7 +223,8 @@ void fillNotification(cta::eos::Notification &notification, bool &isStderr, bool
       else if(argstr == "--user")                notification.mutable_cli()->mutable_user()->set_username(argval);
       else if(argstr == "--group")               notification.mutable_cli()->mutable_user()->set_groupname(argval);
 
-      else if(argstr == "--dsturl")              notification.mutable_transport()->set_url(argval); // for retrieve WF
+      else if(argstr == "--reportURL")           notification.mutable_transport()->set_report_url(argval); // for archive WF
+      else if(argstr == "--dsturl")              notification.mutable_transport()->set_dst_url(argval); // for retrieve WF
 
       else if(argstr == "--diskid")              notification.mutable_file()->set_fid(std::stoi(argval));
       else if(argstr == "--diskfileowner")       notification.mutable_file()->mutable_owner()->set_username(argval);

xroot_plugins/XrdSsiCtaRequestMessage.cpp

@@ -27,7 +27,7 @@ using XrdSsiPb::PbException;
 namespace cta { namespace xrd {
 
 // Convert AdminCmd <Cmd, SubCmd> pair to an integer so that it can be used in a switch statement
-constexpr inline unsigned int cmd_pair(cta::admin::AdminCmd::Cmd cmd, cta::admin::AdminCmd::SubCmd subcmd) {
+constexpr unsigned int cmd_pair(cta::admin::AdminCmd::Cmd cmd, cta::admin::AdminCmd::SubCmd subcmd) {
    return (cmd << 16) + subcmd;
 }
 
@@ -167,7 +167,7 @@ void RequestMessage::processCLOSEW(const cta::eos::Notification &notification, c
    request.requester        = originator;
    request.srcURL           = notification.wf().instance().url();
    request.storageClass     = notification.file().xattr().at("CTA_StorageClass");
-   request.archiveReportURL = "null:";
+   request.archiveReportURL = notification.transport().report_url();
 
    // Queue the request
 
@@ -203,7 +203,7 @@ void RequestMessage::processPREPARE(const cta::eos::Notification &notification,
 
    cta::common::dataStructures::RetrieveRequest request;
    request.requester        = originator;
-   request.dstURL           = notification.transport().url();
+   request.dstURL           = notification.transport().dst_url();
    request.diskFileInfo     = diskFileInfo;
 
    // CTA Archive ID is an EOS extended attribute, i.e. it is stored as a string, which

xroot_plugins/messages/cta_eos.proto

@@ -77,7 +77,8 @@ message Client {
 }
 
 message Transport {
-  string url                 = 1;       //< transport URL
+  string dst_url             = 1;       //< transport destination URL
+  string report_url          = 2;       //< URL to report successful archiving
 }
 
 message Metadata {