1 files changed, 46 insertions, 4 deletions

diff --git a/extras/vom/vom/gbp_contract_cmds.cpp b/extras/vom/vom/gbp_contract_cmds.cpp
index f99092451fe..db49f9751f1 100644
--- a/extras/vom/vom/gbp_contract_cmds.cpp
+++ b/extras/vom/vom/gbp_contract_cmds.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "vom/gbp_contract_cmds.hpp"
+#include "vom/api_types.hpp"
 
 namespace VOM {
 namespace gbp_contract_cmds {
@@ -21,11 +22,13 @@ namespace gbp_contract_cmds {
 create_cmd::create_cmd(HW::item<bool>& item,
                        epg_id_t src_epg_id,
                        epg_id_t dst_epg_id,
-                       const handle_t& acl)
+                       const handle_t& acl,
+                       const gbp_contract::gbp_rules_t& gbp_rules)
   : rpc_cmd(item)
   , m_src_epg_id(src_epg_id)
   , m_dst_epg_id(dst_epg_id)
   , m_acl(acl)
+  , m_gbp_rules(gbp_rules)
 {
 }
 
@@ -33,20 +36,59 @@ bool
 create_cmd::operator==(const create_cmd& other) const
 {
   return ((m_acl == other.m_acl) && (m_src_epg_id == other.m_src_epg_id) &&
-          (m_dst_epg_id == other.m_dst_epg_id));
+          (m_dst_epg_id == other.m_dst_epg_id) &&
+          (m_gbp_rules == other.m_gbp_rules));
 }
 
 rc_t
 create_cmd::issue(connection& con)
 {
-  msg_t req(con.ctx(), 1, std::ref(*this));
+  u8 size = m_gbp_rules.empty() ? 1 : m_gbp_rules.size();
+  msg_t req(con.ctx(), size, std::ref(*this));
 
   auto& payload = req.get_request().get_payload();
   payload.is_add = 1;
   payload.contract.acl_index = m_acl.value();
   payload.contract.src_epg = m_src_epg_id;
   payload.contract.dst_epg = m_dst_epg_id;
-
+  if (size > 1) {
+    u32 ii = 0;
+    auto it = m_gbp_rules.cbegin();
+    payload.contract.n_rules = m_gbp_rules.size();
+    while (it != m_gbp_rules.cend()) {
+      if (it->action() == gbp_rule::action_t::REDIRECT)
+        payload.contract.rules[ii].action = GBP_API_RULE_REDIRECT;
+      else if (it->action() == gbp_rule::action_t::PERMIT)
+        payload.contract.rules[ii].action = GBP_API_RULE_PERMIT;
+      else
+        payload.contract.rules[ii].action = GBP_API_RULE_DENY;
+
+      if (it->nhs().getHashMode() == gbp_rule::hash_mode_t::SYMMETRIC)
+        payload.contract.rules[ii].nh_set.hash_mode =
+          GBP_API_HASH_MODE_SYMMETRIC;
+      else if (it->nhs().getHashMode() == gbp_rule::hash_mode_t::SRC_IP)
+        payload.contract.rules[ii].nh_set.hash_mode = GBP_API_HASH_MODE_SRC_IP;
+      else
+        payload.contract.rules[ii].nh_set.hash_mode = GBP_API_HASH_MODE_DST_IP;
+
+      const gbp_rule::next_hops_t& next_hops = it->nhs().getNextHops();
+      u8 jj = 0, nh_size = (next_hops.size() > 8) ? 8 : next_hops.size();
+      auto nh_it = next_hops.cbegin();
+
+      payload.contract.rules[ii].nh_set.n_nhs = nh_size;
+      while (jj < nh_size) {
+        payload.contract.rules[ii].nh_set.nhs[jj].ip = to_api(nh_it->getIp());
+        payload.contract.rules[ii].nh_set.nhs[jj].mac = to_api(nh_it->getMac());
+        payload.contract.rules[ii].nh_set.nhs[jj].bd_id = nh_it->getBdId();
+        payload.contract.rules[ii].nh_set.nhs[jj].rd_id = nh_it->getRdId();
+        ++nh_it;
+        ++jj;
+      }
+
+      ++it;
+      ++ii;
+    }
+  }
   VAPI_CALL(req.execute());
 
   return (wait());