diff options
author | Neale Ranns <nranns@cisco.com> | 2019-02-22 02:48:25 -0800 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2019-02-22 13:45:38 +0000 |
commit | 533220058344d0dadc05ec82f7de6dbbf8b8b397 (patch) | |
tree | 828c4d26ac919f57ea70e29bf078f60bedd63943 /extras/vom/vom/l2_vtr.cpp | |
parent | fb2e07d89a95272fbf166a500566a699a5fdfd5b (diff) |
VOM: fix tests and namespacify l2_vtr
Change-Id: Ie59220a622c3a5195485cd6857b45f57d6eeaf95
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'extras/vom/vom/l2_vtr.cpp')
-rw-r--r-- | extras/vom/vom/l2_vtr.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/extras/vom/vom/l2_vtr.cpp b/extras/vom/vom/l2_vtr.cpp index 707a2239ebe..61505f68210 100644 --- a/extras/vom/vom/l2_vtr.cpp +++ b/extras/vom/vom/l2_vtr.cpp @@ -16,25 +16,28 @@ #include "vom/l2_vtr.hpp" namespace VOM { +namespace l2_vtr { /* * Make sure these are in sync with the smae enum in VPP */ -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_DISABLED(0, "disabled"); -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_PUSH_1(1, "push-1"); -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_PUSH_2(2, "push-2"); -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_POP_1(3, "pop-1"); -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_POP_2(4, "pop-2"); -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_TRANSLATE_1_1(5, "translate-1-1"); -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_TRANSLATE_1_2(6, "translate-1-2"); -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_TRANSLATE_2_1(7, "translate-2-1"); -const l2_vtr_op_t l2_vtr_op_t::L2_VTR_TRANSLATE_2_2(5, "translate-2-2"); +const option_t option_t::DISABLED(0, "disabled"); +const option_t option_t::PUSH_1(1, "push-1"); +const option_t option_t::PUSH_2(2, "push-2"); +const option_t option_t::POP_1(3, "pop-1"); +const option_t option_t::POP_2(4, "pop-2"); +const option_t option_t::TRANSLATE_1_1(5, "translate-1-1"); +const option_t option_t::TRANSLATE_1_2(6, "translate-1-2"); +const option_t option_t::TRANSLATE_2_1(7, "translate-2-1"); +const option_t option_t::TRANSLATE_2_2(5, "translate-2-2"); -l2_vtr_op_t::l2_vtr_op_t(int v, const std::string s) - : enum_base<l2_vtr_op_t>(v, s) +option_t::option_t(int v, const std::string s) + : enum_base<option_t>(v, s) { } -} + +}; // namespace l2_vtr +}; // namespace VOM /* * fd.io coding-style-patch-verification: ON |