ct_zones is not really used in lflow_run, so remove the dependency.
Signed-off-by: Han Zhou <zhou...@gmail.com>
---
include/ovn/actions.h | 3 ---
ovn/controller/lflow.c | 9 ++-------
ovn/controller/lflow.h | 1 -
ovn/controller/ovn-controller.c | 2 +-
tests/test-ovn.c | 5 +----
5 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/include/ovn/actions.h b/include/ovn/actions.h
index d2510fd..bb8f1ac 100644
--- a/include/ovn/actions.h
+++ b/include/ovn/actions.h
@@ -448,9 +448,6 @@ struct ovnact_encode_params {
/* 'true' if the flow is for a gateway router. */
bool is_gateway_router;
- /* A map from a port name to its connection tracking zone. */
- const struct simap *ct_zones;
-
/* A struct to figure out the group_id for group actions. */
struct group_table *group_table;
diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c
index fa00db2..b1b4b23 100644
--- a/ovn/controller/lflow.c
+++ b/ovn/controller/lflow.c
@@ -60,7 +60,6 @@ static void consider_logical_flow(const struct lport_index
*lports,
const struct sbrec_logical_flow *lflow,
const struct hmap *local_datapaths,
struct group_table *group_table,
- const struct simap *ct_zones,
const struct sbrec_chassis *chassis,
struct hmap *dhcp_opts,
struct hmap *dhcpv6_opts,
@@ -122,7 +121,6 @@ add_logical_flows(struct controller_ctx *ctx, const struct
lport_index *lports,
const struct mcgroup_index *mcgroups,
const struct hmap *local_datapaths,
struct group_table *group_table,
- const struct simap *ct_zones,
const struct sbrec_chassis *chassis,
const struct shash *addr_sets,
struct hmap *flow_table)
@@ -147,7 +145,7 @@ add_logical_flows(struct controller_ctx *ctx, const struct
lport_index *lports,
SBREC_LOGICAL_FLOW_FOR_EACH (lflow, ctx->ovnsb_idl) {
consider_logical_flow(lports, mcgroups, lflow, local_datapaths,
- group_table, ct_zones, chassis,
+ group_table, chassis,
&dhcp_opts, &dhcpv6_opts, &conj_id_ofs,
addr_sets, flow_table);
}
@@ -162,7 +160,6 @@ consider_logical_flow(const struct lport_index *lports,
const struct sbrec_logical_flow *lflow,
const struct hmap *local_datapaths,
struct group_table *group_table,
- const struct simap *ct_zones,
const struct sbrec_chassis *chassis,
struct hmap *dhcp_opts,
struct hmap *dhcpv6_opts,
@@ -231,7 +228,6 @@ consider_logical_flow(const struct lport_index *lports,
.aux = &aux,
.is_switch = is_switch(ldp),
.is_gateway_router = is_gateway_router(ldp, local_datapaths),
- .ct_zones = ct_zones,
.group_table = group_table,
.pipeline = ingress ? OVNACT_P_INGRESS : OVNACT_P_EGRESS,
@@ -394,12 +390,11 @@ lflow_run(struct controller_ctx *ctx,
const struct mcgroup_index *mcgroups,
const struct hmap *local_datapaths,
struct group_table *group_table,
- const struct simap *ct_zones,
const struct shash *addr_sets,
struct hmap *flow_table)
{
add_logical_flows(ctx, lports, mcgroups, local_datapaths, group_table,
- ct_zones, chassis, addr_sets, flow_table);
+ chassis, addr_sets, flow_table);
add_neighbor_flows(ctx, lports, flow_table);
}
diff --git a/ovn/controller/lflow.h b/ovn/controller/lflow.h
index 4f284a0..8761b1e 100644
--- a/ovn/controller/lflow.h
+++ b/ovn/controller/lflow.h
@@ -68,7 +68,6 @@ void lflow_run(struct controller_ctx *,
const struct mcgroup_index *,
const struct hmap *local_datapaths,
struct group_table *group_table,
- const struct simap *ct_zones,
const struct shash *addr_sets,
struct hmap *flow_table);
void lflow_destroy(void);
diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index e00f57a..b880a9e 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -644,7 +644,7 @@ main(int argc, char *argv[])
struct hmap flow_table = HMAP_INITIALIZER(&flow_table);
lflow_run(&ctx, chassis, &lports, &mcgroups,
- &local_datapaths, &group_table, &ct_zones,
+ &local_datapaths, &group_table,
&addr_sets, &flow_table);
physical_run(&ctx, mff_ovn_geneve,
diff --git a/tests/test-ovn.c b/tests/test-ovn.c
index 2551ad8..18860ae 100644
--- a/tests/test-ovn.c
+++ b/tests/test-ovn.c
@@ -1191,7 +1191,7 @@ test_parse_actions(struct ovs_cmdl_context *ctx
OVS_UNUSED)
struct shash symtab;
struct hmap dhcp_opts;
struct hmap dhcpv6_opts;
- struct simap ports, ct_zones;
+ struct simap ports;
struct ds input;
bool ok = true;
@@ -1209,7 +1209,6 @@ test_parse_actions(struct ovs_cmdl_context *ctx
OVS_UNUSED)
simap_put(&ports, "eth0", 5);
simap_put(&ports, "eth1", 6);
simap_put(&ports, "LOCAL", ofp_to_u16(OFPP_LOCAL));
- simap_init(&ct_zones);
ds_init(&input);
while (!ds_get_test_line(&input, stdin)) {
@@ -1243,7 +1242,6 @@ test_parse_actions(struct ovs_cmdl_context *ctx
OVS_UNUSED)
.lookup_port = lookup_port_cb,
.aux = &ports,
.is_switch = true,
- .ct_zones = &ct_zones,
.group_table = &group_table,
.pipeline = OVNACT_P_INGRESS,
@@ -1306,7 +1304,6 @@ test_parse_actions(struct ovs_cmdl_context *ctx
OVS_UNUSED)
ds_destroy(&input);
simap_destroy(&ports);
- simap_destroy(&ct_zones);
expr_symtab_destroy(&symtab);
shash_destroy(&symtab);
dhcp_opts_destroy(&dhcp_opts);
--
2.1.0
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
