X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fgbp_contract_cmds.cpp;h=b57053477915f36b42d8820fdeef7868612ddf7e;hb=fa0ac2c56;hp=5cdd885f304447475c4449ead188c8d47e9f4c22;hpb=dc8d93b02949f508d5eed312a51aa91102224b39;p=vpp.git

diff --git a/extras/vom/vom/gbp_contract_cmds.cpp b/extras/vom/vom/gbp_contract_cmds.cpp
index 5cdd885f304..b5705347791 100644
--- a/extras/vom/vom/gbp_contract_cmds.cpp
+++ b/extras/vom/vom/gbp_contract_cmds.cpp
@@ -20,14 +20,14 @@ namespace VOM {
 namespace gbp_contract_cmds {
 
 create_cmd::create_cmd(HW::item<bool>& item,
-                       epg_id_t src_epg_id,
-                       epg_id_t dst_epg_id,
+                       sclass_t sclass,
+                       sclass_t dclass,
                        const handle_t& acl,
                        const gbp_contract::gbp_rules_t& gbp_rules,
                        const gbp_contract::ethertype_set_t& allowed_ethertypes)
   : rpc_cmd(item)
-  , m_src_epg_id(src_epg_id)
-  , m_dst_epg_id(dst_epg_id)
+  , m_sclass(sclass)
+  , m_dclass(dclass)
   , m_acl(acl)
   , m_gbp_rules(gbp_rules)
   , m_allowed_ethertypes(allowed_ethertypes)
@@ -37,29 +37,37 @@ create_cmd::create_cmd(HW::item<bool>& item,
 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_gbp_rules == other.m_gbp_rules) &&
+  return ((m_acl == other.m_acl) && (m_sclass == other.m_sclass) &&
+          (m_dclass == other.m_dclass) && (m_gbp_rules == other.m_gbp_rules) &&
           (m_allowed_ethertypes == other.m_allowed_ethertypes));
 }
 
+#define ARRAY_LEN(x) (sizeof(x) / sizeof(x[0]))
+
 rc_t
 create_cmd::issue(connection& con)
 {
   size_t n_rules = m_gbp_rules.size();
-  size_t n_et_rules = 0;
+  uint32_t ii = 0;
 
-  msg_t req(con.ctx(), n_rules, n_et_rules, std::ref(*this));
+  msg_t req(con.ctx(), n_rules, 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;
-
-  uint32_t ii = 0;
+  payload.contract.sclass = m_sclass;
+  payload.contract.dclass = m_dclass;
   payload.contract.n_rules = n_rules;
+  payload.contract.n_ether_types = m_allowed_ethertypes.size();
+
+  for (auto tt : m_allowed_ethertypes) {
+    payload.contract.allowed_ethertypes[ii] = tt.value();
+    ii++;
+    if (ii == ARRAY_LEN(payload.contract.allowed_ethertypes))
+      break;
+  }
 
+  ii = 0;
   for (auto rule : m_gbp_rules) {
     if (rule.action() == gbp_rule::action_t::REDIRECT)
       payload.contract.rules[ii].action = GBP_API_RULE_REDIRECT;
@@ -89,19 +97,6 @@ create_cmd::issue(connection& con)
     ++ii;
   }
 
-  u8* data;
-  u16* et;
-
-  data = (((u8*)&payload.contract.n_ether_types) +
-          (sizeof(payload.contract.rules[0]) * payload.contract.n_rules));
-  *data = m_allowed_ethertypes.size();
-  et = (u16*)(++data);
-  ii = 0;
-  for (auto tt : m_allowed_ethertypes) {
-    et[ii] = tt.value();
-    ii++;
-  }
-
   VAPI_CALL(req.execute());
 
   return (wait());
@@ -112,8 +107,7 @@ create_cmd::to_string() const
 {
   std::ostringstream s;
   s << "gbp-contract-create: " << m_hw_item.to_string()
-    << " src-epg-id:" << m_src_epg_id << " dst-epg-id:" << m_dst_epg_id
-    << " acl:" << m_acl;
+    << " sclass:" << m_sclass << " dclass:" << m_dclass << " acl:" << m_acl;
   s << "[ethertype:";
   for (auto e : m_allowed_ethertypes)
     s << " " << e;
@@ -122,32 +116,29 @@ create_cmd::to_string() const
   return (s.str());
 }
 
-delete_cmd::delete_cmd(HW::item<bool>& item,
-                       epg_id_t src_epg_id,
-                       epg_id_t dst_epg_id)
+delete_cmd::delete_cmd(HW::item<bool>& item, sclass_t sclass, sclass_t dclass)
   : rpc_cmd(item)
-  , m_src_epg_id(src_epg_id)
-  , m_dst_epg_id(dst_epg_id)
+  , m_sclass(sclass)
+  , m_dclass(dclass)
 {
 }
 
 bool
 delete_cmd::operator==(const delete_cmd& other) const
 {
-  return ((m_src_epg_id == other.m_src_epg_id) &&
-          (m_dst_epg_id == other.m_dst_epg_id));
+  return ((m_sclass == other.m_sclass) && (m_dclass == other.m_dclass));
 }
 
 rc_t
 delete_cmd::issue(connection& con)
 {
-  msg_t req(con.ctx(), 0, 0, std::ref(*this));
+  msg_t req(con.ctx(), 0, std::ref(*this));
 
   auto& payload = req.get_request().get_payload();
   payload.is_add = 0;
   payload.contract.acl_index = ~0;
-  payload.contract.src_epg = m_src_epg_id;
-  payload.contract.dst_epg = m_dst_epg_id;
+  payload.contract.sclass = m_sclass;
+  payload.contract.dclass = m_dclass;
 
   VAPI_CALL(req.execute());
 
@@ -159,7 +150,7 @@ delete_cmd::to_string() const
 {
   std::ostringstream s;
   s << "gbp-contract-delete: " << m_hw_item.to_string()
-    << " src-epg-id:" << m_src_epg_id << " dst-epg-id:" << m_dst_epg_id;
+    << " sclass:" << m_sclass << " dclass:" << m_dclass;
 
   return (s.str());
 }