Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vlib: copy trace_handle in vlib_buffer_copy/clone() functions
[vpp.git]
/
extras
/
vom
/
vom
/
gbp_endpoint_group.hpp
diff --git
a/extras/vom/vom/gbp_endpoint_group.hpp
b/extras/vom/vom/gbp_endpoint_group.hpp
index
d6af570
..
e15a188
100644
(file)
--- a/
extras/vom/vom/gbp_endpoint_group.hpp
+++ b/
extras/vom/vom/gbp_endpoint_group.hpp
@@
-22,14
+22,10
@@
#include "vom/gbp_bridge_domain.hpp"
#include "vom/gbp_route_domain.hpp"
#include "vom/gbp_bridge_domain.hpp"
#include "vom/gbp_route_domain.hpp"
+#include "vom/gbp_types.hpp"
namespace VOM {
namespace VOM {
-/**
- * EPG IDs are 32 bit integers
- */
-typedef uint32_t epg_id_t;
-
/**
* A entry in the ARP termination table of a Bridge Domain
*/
/**
* A entry in the ARP termination table of a Bridge Domain
*/
@@
-59,25
+55,21
@@
public:
/**
* The key for a GBP endpoint group is its ID
*/
/**
* The key for a GBP endpoint group is its ID
*/
- typedef
epg_id
_t key_t;
+ typedef
sclass
_t key_t;
/**
* Construct a GBP endpoint_group
*/
/**
* Construct a GBP endpoint_group
*/
- gbp_endpoint_group(epg_id_t epg_id,
+ gbp_endpoint_group(vnid_t vnid,
+ sclass_t sclass,
const interface& itf,
const gbp_route_domain& rd,
const gbp_bridge_domain& bd);
const interface& itf,
const gbp_route_domain& rd,
const gbp_bridge_domain& bd);
- gbp_endpoint_group(epg_id_t epg_id,
- const gbp_route_domain& rd,
- const gbp_bridge_domain& bd);
- gbp_endpoint_group(epg_id_t epg_id,
- uint16_t sclass,
- const interface& itf,
+ gbp_endpoint_group(vnid_t vnid,
+ sclass_t sclass,
const gbp_route_domain& rd,
const gbp_bridge_domain& bd);
const gbp_route_domain& rd,
const gbp_bridge_domain& bd);
- gbp_endpoint_group(epg_id_t epg_id,
- uint16_t sclass,
+ gbp_endpoint_group(sclass_t sclass,
const gbp_route_domain& rd,
const gbp_bridge_domain& bd);
const gbp_route_domain& rd,
const gbp_bridge_domain& bd);
@@
-129,7
+121,8
@@
public:
/**
* Get the ID of the EPG
*/
/**
* Get the ID of the EPG
*/
- epg_id_t id() const;
+ vnid_t vnid() const;
+ sclass_t sclass() const;
const std::shared_ptr<gbp_route_domain> get_route_domain() const;
const std::shared_ptr<gbp_bridge_domain> get_bridge_domain() const;
const std::shared_ptr<gbp_route_domain> get_route_domain() const;
const std::shared_ptr<gbp_bridge_domain> get_bridge_domain() const;
@@
-206,7
+199,7
@@
private:
/**
* The EPG ID
*/
/**
* The EPG ID
*/
-
epg_id_t m_epg_
id;
+
vnid_t m_vn
id;
/**
* The SClass on the wire
/**
* The SClass on the wire