add unit tests for discriminator, struct+enum params
diff --git a/utest/test_frontend.py b/utest/test_frontend.py
index 9249273..8799000 100755
--- a/utest/test_frontend.py
+++ b/utest/test_frontend.py
@@ -56,7 +56,7 @@
#version 2
-struct of_echo_reply {
+struct of_echo_reply(align=8) {
uint8_t version;
uint8_t type == 3;
uint16_t length;
@@ -64,7 +64,7 @@
of_octets_t data;
};
-enum ofp_queue_op_failed_code {
+enum ofp_queue_op_failed_code(wire_type=uint32, bitmask=False, complete=True) {
OFPQOFC_BAD_PORT = 0,
OFPQOFC_BAD_QUEUE = 1,
OFPQOFC_EPERM = 2,
@@ -90,13 +90,14 @@
['OFPPC_NO_FWD', [], 32],
['OFPPC_NO_PACKET_IN', [], 64]]],
['metadata', 'version', '2'],
- ['struct', 'of_echo_reply', [], None, [
+ ['struct', 'of_echo_reply', [['align', '8']], None, [
['data', 'uint8_t', 'version'],
['type', 'uint8_t', 'type', 3],
['data', 'uint16_t', 'length'],
['data', 'uint32_t', 'xid'],
['data', 'of_octets_t', 'data']]],
- ['enum', 'ofp_queue_op_failed_code', [], [
+ ['enum', 'ofp_queue_op_failed_code',
+ [['wire_type', 'uint32'], ['bitmask','False'], ['complete', 'True']], [
['OFPQOFC_BAD_PORT', [], 0],
['OFPQOFC_BAD_QUEUE', [], 1],
['OFPQOFC_EPERM', [], 2]]],
@@ -116,7 +117,8 @@
OFTypeMember('type', 'uint8_t', 3),
OFLengthMember('length', 'uint16_t'),
OFDataMember('xid', 'uint32_t'),
- OFDataMember('data', 'of_octets_t')], virtual=False, params={}),
+ OFDataMember('data', 'of_octets_t')], virtual=False,
+ params={'align': '8'}),
OFClass(name='of_packet_queue', superclass=None, members=[
OFDataMember('queue_id', 'uint32_t'),
OFLengthMember('len', 'uint16_t'),
@@ -136,7 +138,8 @@
OFEnum(name='ofp_queue_op_failed_code', entries=[
OFEnumEntry('OFPQOFC_BAD_PORT', 0, {}),
OFEnumEntry('OFPQOFC_BAD_QUEUE', 1, {}),
- OFEnumEntry('OFPQOFC_EPERM', 2, {})], params={}),
+ OFEnumEntry('OFPQOFC_EPERM', 2, {})],
+ params={'wire_type': 'uint32', 'bitmask': 'False', 'complete': 'True'}),
]
self.assertEquals(expected_enums, ofinput.enums)
diff --git a/utest/test_parser.py b/utest/test_parser.py
index 8199096..9eb3764 100755
--- a/utest/test_parser.py
+++ b/utest/test_parser.py
@@ -54,6 +54,16 @@
self.assertEquals(ast,
[['struct', 'foo', [], None, [['data', 'uint32_t', 'bar']]]])
+ def test_struct_align_arg(self):
+ src = """\
+struct foo(align=8) {
+ uint32_t bar;
+};
+"""
+ ast = parser.parse(src)
+ self.assertEquals(ast,
+ [['struct', 'foo', [['align', '8']], None, [['data', 'uint32_t', 'bar']]]])
+
def test_multiple_fields(self):
src = """\
struct foo {
@@ -119,6 +129,16 @@
self.assertEquals(ast,
[['struct', 'foo', [], 'bar', [['type', 'uint16_t', 'foo', 0x10]]]])
+ def test_discriminator(self):
+ src = """\
+struct foo {
+ uint16_t foo == ?;
+};
+"""
+ ast = parser.parse(src)
+ self.assertEquals(ast,
+ [['struct', 'foo', [], None, [['discriminator', 'uint16_t', 'foo']]]])
+
class EnumTests(unittest.TestCase):
def test_empty(self):
src = """\
@@ -137,6 +157,17 @@
ast = parser.parse(src)
self.assertEquals(ast, [['enum', 'foo', [], [['BAR', [], 1]]]])
+ def test_params(self):
+ src = """\
+enum foo(wire_type=uint32, bitmask=False, complete=False) {
+ BAR = 1
+};
+"""
+ ast = parser.parse(src)
+ self.assertEquals(ast, [['enum', 'foo',
+ [ ['wire_type', 'uint32'], ['bitmask','False'], ['complete', 'False']],
+ [['BAR', [], 1]]]])
+
def test_multiple(self):
src = """\
enum foo {