Working on DP priority update

Author: timcanham

Svc/DpCatalog/DpCatalog.cpp

@@ -1074,6 +1074,42 @@ namespace Svc {
 
         this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
     }
+
+    void DpCatalog ::UPDATE_DP_PRIO_cmdHandler(FwOpcodeType opCode,
+        U32 cmdSeq,
+        U32 dir,
+        U32 id,
+        U32 tSec,
+        U32 tSub,
+        U32 prio) {
+
+        // build file name based on the entry to update
+        Fw::FileNameString prioFileName;
+        prioFileName.format(DP_FILENAME_FORMAT,
+            this->m_directories[dir].toChar(),
+            id,
+            tSec,
+            tSub
+        );
+
+        // check to see if file exists
+        bool exists = Os::FileSystem::exists(
+            prioFileName.toChar());
+
+        if (not exists) {
+            // If it doesn't exist, don't continue.
+            // Don't fail the command so a long list of attempts to 
+            // do DP maintenance fail.
+            this->log_WARNING_LO_DpUpdateNoFileError(prioFileName);
+        } else {
+            // if the file exists, delete it from the tree and reinsert
+            // it with the new priority
+            
+        }
+
+        this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
+    }
+
 
 
 

Svc/DpCatalog/DpCatalog.fpp

@@ -99,6 +99,15 @@ module Svc {
     ) \
       opcode 4
 
+    @ update existing DP priority
+    async command UPDATE_DP_PRIO (
+        dir: U32 # The directory index of the file
+        $id: U32 # The ID of the data product
+        tSec: U32 # Generation time in seconds
+        tSub: U32 # Generation time in subseconds
+        prio: U32 # Updated priority
+    ) \
+      opcode 5
 
     # ----------------------------------------------------------------------
     # Events
@@ -400,7 +409,24 @@ module Svc {
       format "Couldn't delete file {}, stat {}." \
       throttle 25
 
+    event DpUpdateNoFileError(
+                            file: string size 80 @< The file
+                          ) \
+      severity warning low \
+      id 46 \
+      format "Couldn't update priority for file {}, doesn't exist" \
+      throttle 25
 
+    @ DP priority updated
+    event DpPrioUpdated (
+                $id: U32 # The ID of the data product
+                tSec: U32 # Generation time in seconds
+                tSub: U32 # Generation time in subseconds
+                prio: U32  # new priority
+            ) \
+      severity activity low \
+      id 47 \
+      format "Priority updated for product ID {},{},{} to {}"
 
     # ----------------------------------------------------------------------
     # Telemetry

Svc/DpCatalog/DpCatalog.hpp

@@ -128,6 +128,18 @@ namespace Svc {
             U32 tSec,
             U32 tSub) override;
 
+        //! Handler implementation for command UPDATE_DP_PRIO
+        //!
+        //! update existing DP priority
+        void UPDATE_DP_PRIO_cmdHandler(FwOpcodeType opCode,  //!< The opcode
+            U32 cmdSeq,           //!< The command sequence number
+            U32 dir,
+            U32 id,
+            U32 tSec,
+            U32 tSub,
+            U32 prio) override;
+
+
         // ----------------------------------
         // Private data structures
         // ----------------------------------