diff options
| author | Ben Pfaff <blp@nicira.com> | 2015-03-03 15:32:59 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2015-03-03 16:19:29 -0800 |
| commit | 02c842eb74e9d966dd613aed149490e28c06ec3b (patch) | |
| tree | a5959aee0932f128986bde1b8582df2ebe124894 /tests | |
| parent | 24885e3232f53d81856ea3c6166ff7564b27af9d (diff) | |
| download | openvswitch-02c842eb74e9d966dd613aed149490e28c06ec3b.tar.gz | |
lldp: Change representation of ISID to uint32_t.
It's a lot more straightforward to deal with integer values as integers
instead of arrays of bytes.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-aa.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/tests/test-aa.c b/tests/test-aa.c index 843249e7b..19c43672b 100644 --- a/tests/test-aa.c +++ b/tests/test-aa.c @@ -117,12 +117,8 @@ check_received_aa(struct lldpd_port *sport, received_map->isid_vlan_data.status); assert(smap[i].isid_vlan_data.vlan == received_map->isid_vlan_data.vlan); - assert(smap[i].isid_vlan_data.isid[0] == - received_map->isid_vlan_data.isid[0]); - assert(smap[i].isid_vlan_data.isid[1] == - received_map->isid_vlan_data.isid[1]); - assert(smap[i].isid_vlan_data.isid[2] == - received_map->isid_vlan_data.isid[2]); + assert(smap[i].isid_vlan_data.isid == + received_map->isid_vlan_data.isid); /* Next mapping sent */ i++; @@ -191,15 +187,11 @@ test_aa_send(void) /* ISID/VLAN mappings */ map_init[0].isid_vlan_data.status = 0xC; map_init[0].isid_vlan_data.vlan = 0x64; - map_init[0].isid_vlan_data.isid[0] = 1; - map_init[0].isid_vlan_data.isid[1] = 2; - map_init[0].isid_vlan_data.isid[2] = 3; + map_init[0].isid_vlan_data.isid = 0x010203; map_init[1].isid_vlan_data.status = 0xD; map_init[1].isid_vlan_data.vlan = 0xF; - map_init[1].isid_vlan_data.isid[0] = 4; - map_init[1].isid_vlan_data.isid[1] = 5; - map_init[1].isid_vlan_data.isid[2] = 6; + map_init[1].isid_vlan_data.isid = 0x040506; /* Prepare an empty packet buffer */ dp_packet_use_stub(&packet, stub, sizeof stub); @@ -262,15 +254,11 @@ test_aa_send(void) /* Populate instance with two auto attach isid/vlan mappings */ map[0].isid_vlan_data.status = map_init[0].isid_vlan_data.status; map[0].isid_vlan_data.vlan = map_init[0].isid_vlan_data.vlan; - map[0].isid_vlan_data.isid[0] = map_init[0].isid_vlan_data.isid[0]; - map[0].isid_vlan_data.isid[1] = map_init[0].isid_vlan_data.isid[1]; - map[0].isid_vlan_data.isid[2] = map_init[0].isid_vlan_data.isid[2]; + map[0].isid_vlan_data.isid = map_init[0].isid_vlan_data.isid; map[1].isid_vlan_data.status = map_init[1].isid_vlan_data.status; map[1].isid_vlan_data.vlan = map_init[1].isid_vlan_data.vlan; - map[1].isid_vlan_data.isid[0] = map_init[1].isid_vlan_data.isid[0]; - map[1].isid_vlan_data.isid[1] = map_init[1].isid_vlan_data.isid[1]; - map[1].isid_vlan_data.isid[2] = map_init[1].isid_vlan_data.isid[2]; + map[1].isid_vlan_data.isid = map_init[1].isid_vlan_data.isid; list_init(&hw->h_lport.p_isid_vlan_maps.m_entries); list_push_back(&hw->h_lport.p_isid_vlan_maps.m_entries, |