projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packets: Remove unneeded !! from eth_addr_is_local().
[openvswitch]
/
tests
/
test-classifier.c
diff --git
a/tests/test-classifier.c
b/tests/test-classifier.c
index 9af8aacba08b6ca01326f38d141af5e1f411f507..1cfd5cf6ec806078c404def8e4f374a5fb47f570 100644
(file)
--- a/
tests/test-classifier.c
+++ b/
tests/test-classifier.c
@@
-251,7
+251,7
@@
static ovs_be32 nw_dst_values[] = { CONSTANT_HTONL(0xc0a80002),
static ovs_be64 tun_id_values[] = {
0,
CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) };
static ovs_be64 tun_id_values[] = {
0,
CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) };
-static uint16_t in_port_values[] = { 1, O
D
PP_LOCAL };
+static uint16_t in_port_values[] = { 1, O
F
PP_LOCAL };
static ovs_be16 vlan_tci_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) };
static ovs_be16 dl_type_values[]
= { CONSTANT_HTONS(ETH_TYPE_IP), CONSTANT_HTONS(ETH_TYPE_ARP) };
static ovs_be16 vlan_tci_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) };
static ovs_be16 dl_type_values[]
= { CONSTANT_HTONS(ETH_TYPE_IP), CONSTANT_HTONS(ETH_TYPE_ARP) };
@@
-526,7
+526,7
@@
test_single_rule(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
tcls_init(&tcls);
tcls_rule = tcls_insert(&tcls, rule);
tcls_init(&tcls);
tcls_rule = tcls_insert(&tcls, rule);
-
assert(!classifier_insert(&cls, &rule->cls_rule)
);
+
classifier_insert(&cls, &rule->cls_rule
);
check_tables(&cls, 1, 1, 0);
compare_classifiers(&cls, &tcls);
check_tables(&cls, 1, 1, 0);
compare_classifiers(&cls, &tcls);
@@
-562,7
+562,7
@@
test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
classifier_init(&cls);
tcls_init(&tcls);
tcls_insert(&tcls, rule1);
classifier_init(&cls);
tcls_init(&tcls);
tcls_insert(&tcls, rule1);
-
assert(!classifier_insert(&cls, &rule1->cls_rule)
);
+
classifier_insert(&cls, &rule1->cls_rule
);
check_tables(&cls, 1, 1, 0);
compare_classifiers(&cls, &tcls);
tcls_destroy(&tcls);
check_tables(&cls, 1, 1, 0);
compare_classifiers(&cls, &tcls);
tcls_destroy(&tcls);
@@
-570,7
+570,7
@@
test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
tcls_init(&tcls);
tcls_insert(&tcls, rule2);
assert(test_rule_from_cls_rule(
tcls_init(&tcls);
tcls_insert(&tcls, rule2);
assert(test_rule_from_cls_rule(
- classifier_
insert
(&cls, &rule2->cls_rule)) == rule1);
+ classifier_
replace
(&cls, &rule2->cls_rule)) == rule1);
free(rule1);
check_tables(&cls, 1, 1, 0);
compare_classifiers(&cls, &tcls);
free(rule1);
check_tables(&cls, 1, 1, 0);
compare_classifiers(&cls, &tcls);
@@
-681,7
+681,7
@@
test_many_rules_in_one_list (int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
tcls_rules[j] = tcls_insert(&tcls, rules[j]);
displaced_rule = test_rule_from_cls_rule(
tcls_rules[j] = tcls_insert(&tcls, rules[j]);
displaced_rule = test_rule_from_cls_rule(
- classifier_
insert
(&cls, &rules[j]->cls_rule));
+ classifier_
replace
(&cls, &rules[j]->cls_rule));
if (pri_rules[pris[j]] >= 0) {
int k = pri_rules[pris[j]];
assert(displaced_rule != NULL);
if (pri_rules[pris[j]] >= 0) {
int k = pri_rules[pris[j]];
assert(displaced_rule != NULL);
@@
-781,7
+781,7
@@
test_many_rules_in_one_table(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
rules[i] = make_rule(wcf, priority, value_pats[i]);
tcls_rules[i] = tcls_insert(&tcls, rules[i]);
rules[i] = make_rule(wcf, priority, value_pats[i]);
tcls_rules[i] = tcls_insert(&tcls, rules[i]);
-
assert(!classifier_insert(&cls, &rules[i]->cls_rule)
);
+
classifier_insert(&cls, &rules[i]->cls_rule
);
check_tables(&cls, 1, i + 1, 0);
compare_classifiers(&cls, &tcls);
check_tables(&cls, 1, i + 1, 0);
compare_classifiers(&cls, &tcls);
@@
-839,7
+839,7
@@
test_many_rules_in_n_tables(int n_tables)
int value_pat = rand() & ((1u << CLS_N_FIELDS) - 1);
rule = make_rule(wcf, priority, value_pat);
tcls_insert(&tcls, rule);
int value_pat = rand() & ((1u << CLS_N_FIELDS) - 1);
rule = make_rule(wcf, priority, value_pat);
tcls_insert(&tcls, rule);
-
assert(!classifier_insert(&cls, &rule->cls_rule)
);
+
classifier_insert(&cls, &rule->cls_rule
);
check_tables(&cls, -1, i + 1, -1);
compare_classifiers(&cls, &tcls);
}
check_tables(&cls, -1, i + 1, -1);
compare_classifiers(&cls, &tcls);
}