X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fgbp_contract.hpp;h=caf5a3c5a0ee8db97315f17f3c058c3aa214bcd1;hb=refs%2Fchanges%2F19%2F22819%2F26;hp=2e8f9d0bc269e5a1da2e3cd267d7987bfc6d03c2;hpb=796c84b25130c99cfd92cc9281416d377d41d2a3;p=vpp.git

diff --git a/extras/vom/vom/gbp_contract.hpp b/extras/vom/vom/gbp_contract.hpp
index 2e8f9d0bc26..caf5a3c5a0e 100644
--- a/extras/vom/vom/gbp_contract.hpp
+++ b/extras/vom/vom/gbp_contract.hpp
@@ -17,8 +17,8 @@
 #define __VOM_GBP_CONTRACT_H__
 
 #include "vom/acl_l3_list.hpp"
-#include "vom/gbp_endpoint.hpp"
 #include "vom/gbp_rule.hpp"
+#include "vom/gbp_types.hpp"
 #include "vom/interface.hpp"
 #include "vom/singular_db.hpp"
 #include "vom/types.hpp"
@@ -39,7 +39,7 @@ public:
   /**
    * The key for a contract is the pair of EPG-IDs
    */
-  typedef std::pair<sclass_t, sclass_t> key_t;
+  typedef std::tuple<scope_t, sclass_t, sclass_t> key_t;
 
   /**
    * A set of allowed ethertypes
@@ -49,7 +49,8 @@ public:
   /**
    * Construct a GBP contract
    */
-  gbp_contract(sclass_t sclass,
+  gbp_contract(scope_t scope,
+               sclass_t sclass,
                sclass_t dclass,
                const ACL::l3_list& acl,
                const gbp_rules_t& gpb_rules,
@@ -166,6 +167,11 @@ private:
    */
   HW::item<uint32_t> m_hw;
 
+  /*
+   * The scope of the contract
+   */
+  scope_t m_scope;
+
   /**
    * The source EPG ID
    */