A bit of buffer metadata reshuffling to accommodate flow_id

[vpp.git] / src / vpp-api / vom / hw.hpp

diff --git a/src/vpp-api/vom/hw.hpp b/src/vpp-api/vom/hw.hpp
index ef34a4c..9ba4750 100644 (file)
--- a/src/vpp-api/vom/hw.hpp
+++ b/src/vpp-api/vom/hw.hpp
@@ -18,17 +18,18 @@
 
 #include <deque>
 #include <map>
+#include <queue>
 #include <sstream>
 #include <string>
 #include <thread>
 
-#include <vapi/vapi.hpp>
-#include <vapi/vpe.api.vapi.hpp>
-
+#include "vom/cmd.hpp"
 #include "vom/connection.hpp"
-#include "vom/rpc_cmd.hpp"
+#include "vom/types.hpp"
 
 namespace VOM {
+
+class cmd;
 class HW
 {
 public:
@@ -77,6 +78,11 @@ public:
     {
     }
 
+    /**
+     * Destructor
+     */
+    ~item() = default;
+
     /**
      * Comparison operator
      */
@@ -208,16 +214,6 @@ public:
      */
     virtual void enqueue(std::queue<cmd*>& c);
 
-    /**
-     * dequeue a command from the Q.
-     */
-    virtual void dequeue(cmd* c);
-
-    /**
-     * dequeue a command from the Q.
-     */
-    virtual void dequeue(std::shared_ptr<cmd> c);
-
     /**
      * Write all the commands to HW
      */
@@ -226,7 +222,12 @@ public:
     /**
      * Blocking Connect to VPP - call once at bootup
      */
-    void connect();
+    virtual bool connect();
+
+    /**
+     * Disconnect to VPP
+     */
+    virtual void disconnect();
 
     /**
      * Disable the passing of commands to VPP. Whilst disabled all
@@ -305,16 +306,6 @@ public:
    */
   static void enqueue(std::queue<cmd*>& c);
 
-  /**
-   * dequeue A command for execution
-   */
-  static void dequeue(cmd* f);
-
-  /**
-   * dequeue A command for execution
-   */
-  static void dequeue(std::shared_ptr<cmd> c);
-
   /**
    * Write/Execute all commands hitherto enqueued.
    */
@@ -323,7 +314,12 @@ public:
   /**
    * Blocking Connect to VPP
    */
-  static void connect();
+  static bool connect();
+
+  /**
+   * Disconnect to VPP
+   */
+  static void disconnect();
 
   /**
    * Blocking pool of the HW connection
@@ -357,33 +353,6 @@ private:
    * Only the OM can enable/disable HW
    */
   friend class OM;
-
-  /**
-   * A command pool the HW for liveness
-   */
-  class Poll : public rpc_cmd<HW::item<bool>, rc_t, vapi::Control_ping>
-  {
-  public:
-    /**
-     * Constructor taking the HW::item to update
-     */
-    Poll(HW::item<bool>& item);
-
-    /**
-     * Issue the command to VPP/HW
-     */
-    rc_t issue(connection& con);
-
-    /**
-     * convert to string format for debug purposes
-     */
-    std::string to_string() const;
-
-    /**
-     * Comparison operator - only used for UT
-     */
-    bool operator==(const Poll& i) const;
-  };
 };
 
 /**