Skip to content

Commit

Permalink
ovn-controller.c: Remove unnecessary asserts and useless variables.
Browse files Browse the repository at this point in the history
Signed-off-by: Han Zhou <hzhou@ovn.org>
Acked-by: Mark Michelson <mmichels@redhat.com>
Acked-by: Numan Siddique <numans@ovn.org>
  • Loading branch information
hzhou8 committed Feb 24, 2022
1 parent eeb51fa commit a0f36dd
Showing 1 changed file with 0 additions and 28 deletions.
28 changes: 0 additions & 28 deletions controller/ovn-controller.c
Expand Up @@ -2428,14 +2428,6 @@ lflow_output_sb_logical_flow_handler(struct engine_node *node, void *data)
engine_get_input_data("runtime_data", node);
struct ed_type_non_vif_data *non_vif_data =
engine_get_input_data("non_vif_data", node);
struct ovsrec_open_vswitch_table *ovs_table =
(struct ovsrec_open_vswitch_table *)EN_OVSDB_GET(
engine_get_input("OVS_open_vswitch", node));
struct ovsrec_bridge_table *bridge_table =
(struct ovsrec_bridge_table *)EN_OVSDB_GET(
engine_get_input("OVS_bridge", node));
const struct ovsrec_bridge *br_int = get_br_int(bridge_table, ovs_table);
ovs_assert(br_int);

struct ed_type_lflow_output *fo = data;
struct lflow_ctx_in l_ctx_in;
Expand Down Expand Up @@ -2530,26 +2522,6 @@ _lflow_output_resource_ref_handler(struct engine_node *node, void *data,
struct ed_type_port_groups *pg_data =
engine_get_input_data("port_groups", node);

struct ovsrec_open_vswitch_table *ovs_table =
(struct ovsrec_open_vswitch_table *)EN_OVSDB_GET(
engine_get_input("OVS_open_vswitch", node));
struct ovsrec_bridge_table *bridge_table =
(struct ovsrec_bridge_table *)EN_OVSDB_GET(
engine_get_input("OVS_bridge", node));
const struct ovsrec_bridge *br_int = get_br_int(bridge_table, ovs_table);
const char *chassis_id = get_ovs_chassis_id(ovs_table);

struct ovsdb_idl_index *sbrec_chassis_by_name =
engine_ovsdb_node_get_index(
engine_get_input("SB_chassis", node),
"name");
const struct sbrec_chassis *chassis = NULL;
if (chassis_id) {
chassis = chassis_lookup_by_name(sbrec_chassis_by_name, chassis_id);
}

ovs_assert(br_int && chassis);

struct ed_type_lflow_output *fo = data;

struct lflow_ctx_in l_ctx_in;
Expand Down

0 comments on commit a0f36dd

Please sign in to comment.