Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
GBP: use sclass in the DP for policy
[vpp.git]
/
extras
/
vom
/
vom
/
gbp_contract.hpp
diff --git
a/extras/vom/vom/gbp_contract.hpp
b/extras/vom/vom/gbp_contract.hpp
index
53f8f36
..
7775638
100644
(file)
--- a/
extras/vom/vom/gbp_contract.hpp
+++ b/
extras/vom/vom/gbp_contract.hpp
@@
-16,7
+16,7
@@
#ifndef __VOM_GBP_CONTRACT_H__
#define __VOM_GBP_CONTRACT_H__
#ifndef __VOM_GBP_CONTRACT_H__
#define __VOM_GBP_CONTRACT_H__
-#include "vom/acl_list.hpp"
+#include "vom/acl_l
3_l
ist.hpp"
#include "vom/gbp_endpoint.hpp"
#include "vom/gbp_rule.hpp"
#include "vom/interface.hpp"
#include "vom/gbp_endpoint.hpp"
#include "vom/gbp_rule.hpp"
#include "vom/interface.hpp"
@@
-39,14
+39,21
@@
public:
/**
* The key for a contract is the pari of EPG-IDs
*/
/**
* The key for a contract is the pari of EPG-IDs
*/
- typedef std::pair<epg_id_t, epg_id_t> key_t;
+ typedef std::pair<sclass_t, sclass_t> key_t;
+
+ /**
+ * A set of allowed ethertypes
+ */
+ typedef std::set<ethertype_t> ethertype_set_t;
/**
* Construct a GBP contract
*/
/**
* Construct a GBP contract
*/
- gbp_contract(epg_id_t src_epg_id,
- epg_id_t dst_epg_id,
- const ACL::l3_list& acl);
+ gbp_contract(sclass_t sclass,
+ sclass_t dclass,
+ const ACL::l3_list& acl,
+ const gbp_rules_t& gpb_rules,
+ const ethertype_set_t& allowed_ethertypes);
/**
* Copy Construct
/**
* Copy Construct
@@
-93,11
+100,6
@@
public:
*/
std::string to_string() const;
*/
std::string to_string() const;
- /**
- * Set gbp_rules in case of Redirect Contract
- */
- void set_gbp_rules(const gbp_rules_t& gbp_rules);
-
private:
/**
* Class definition for listeners to OM events
private:
/**
* Class definition for listeners to OM events
@@
-167,12
+169,12
@@
private:
/**
* The source EPG ID
*/
/**
* The source EPG ID
*/
-
epg_id_t m_src_epg_id
;
+
sclass_t m_sclass
;
/**
* The destination EPG ID
*/
/**
* The destination EPG ID
*/
-
epg_id_t m_dst_epg_id
;
+
sclass_t m_dclass
;
/**
* The ACL applied to traffic between the gourps
/**
* The ACL applied to traffic between the gourps
@@
-184,6
+186,11
@@
private:
*/
gbp_rules_t m_gbp_rules;
*/
gbp_rules_t m_gbp_rules;
+ /**
+ * the set of Ether-types allowed by this contract
+ */
+ ethertype_set_t m_allowed_ethertypes;
+
/**
* A map of all bridge_domains
*/
/**
* A map of all bridge_domains
*/