PAN-346 -- the meta-id match is breaking things, so we're backing it out
Revert "Loxigen: added src/dst meta id matches"
This reverts commit 6798fff95a652dabea64ca722e030f11b4f187b3.
diff --git a/loxi_front_end/match.py b/loxi_front_end/match.py
index 5c83859..42c0a9e 100644
--- a/loxi_front_end/match.py
+++ b/loxi_front_end/match.py
@@ -394,28 +394,6 @@
takes_mask_in_spec=False,
order=501,
),
-
- src_meta_id = dict(
- name="src_meta_id",
- m_type="uint8_t",
- v1_wc_shift=23,
- v2_wc_shift=23,
- print_type="PRIx8",
- conditions="",
- takes_mask_in_spec=False,
- order=600,
- ),
-
- dst_meta_id = dict(
- name="dst_meta_id",
- m_type="uint8_t",
- v1_wc_shift=24,
- v2_wc_shift=24,
- print_type="PRIx8",
- conditions="",
- takes_mask_in_spec=False,
- order=601,
- ),
)
match_keys_sorted = of_match_members.keys()
@@ -433,9 +411,7 @@
"tcp_dst", # Means UDP too for 1.0 and 1.1
"tcp_src", # Means UDP too for 1.0 and 1.1
"vlan_pcp",
- "vlan_vid",
- "src_meta_id",
- "dst_meta_id",
+ "vlan_vid"
]
of_v2_keys = [