Acked-By: Ihar Hrachyshka <[email protected]>
On Thu, Apr 13, 2023 at 10:45 AM Lorenzo Bianconi <[email protected]> wrote: > > Remove ovn-egress-iface paramter since it is no longer used. > > https://bugzilla.redhat.com/show_bug.cgi?id=2129742 > Tested-by: Rodolfo Alonso <[email protected]> > Signed-off-by: Lorenzo Bianconi <[email protected]> > --- > controller/binding.c | 23 +---------------------- > northd/ovn-northd.8.xml | 6 ------ > tests/ovn-performance.at | 5 ----- > 3 files changed, 1 insertion(+), 33 deletions(-) > > diff --git a/controller/binding.c b/controller/binding.c > index 3403f74bb..2b1a163d2 100644 > --- a/controller/binding.c > +++ b/controller/binding.c > @@ -197,9 +197,7 @@ get_qos_egress_interface_name(struct shash > *bridge_mappings, > continue; > } > > - bool is_egress_iface = smap_get_bool(&iface_rec->external_ids, > - "ovn-egress-iface", false); > - if (is_egress_iface || !strcmp(iface_rec->type, "")) { > + if (!strcmp(iface_rec->type, "")) { > return iface_rec->name; > } > } > @@ -457,25 +455,6 @@ add_localnet_egress_interface_mappings( > &port_binding->options, "qos_physical_network"); > if (qos_physical_network && !strcmp(qos_physical_network, network)) { > smap_replace(egress_ifaces, port_binding->logical_port, network); > - return; > - } > - > - /* Add egress-ifaces from the connected bridge */ > - for (size_t i = 0; i < br_ln->n_ports; i++) { > - const struct ovsrec_port *port_rec = br_ln->ports[i]; > - > - for (size_t j = 0; j < port_rec->n_interfaces; j++) { > - const struct ovsrec_interface *iface_rec; > - > - iface_rec = port_rec->interfaces[j]; > - bool is_egress_iface = smap_get_bool(&iface_rec->external_ids, > - "ovn-egress-iface", false); > - if (!is_egress_iface) { > - continue; > - } > - smap_replace(egress_ifaces, port_binding->logical_port, > - network); > - } > } > } > > diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml > index 443b3a0bc..2348192c3 100644 > --- a/northd/ovn-northd.8.xml > +++ b/northd/ovn-northd.8.xml > @@ -2238,12 +2238,6 @@ output; > matches on the localnet <code>outport</code> and applies the action > <code>set_queue(id); output;"</code>. > </p> > - > - <p> > - Please remember to mark the corresponding physical interface with > - <code>ovn-egress-iface</code> set to true in > - <ref column="external_ids" table="Interface" db="Open_vSwitch"/>. > - </p> > </li> > > <li> > diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at > index 8ac0a392c..ba329f0f6 100644 > --- a/tests/ovn-performance.at > +++ b/tests/ovn-performance.at > @@ -559,11 +559,6 @@ OVN_CONTROLLER_EXPECT_NO_HIT( > [ovn-nbctl --wait=hv set Logical_Switch_Port ln-public > options:qos_burst=1000] > ) > > -OVN_CONTROLLER_EXPECT_HIT( > - [hv3], [lflow_run], > - [as hv3 ovs-vsctl set interface vgw3 external-ids:ovn-egress-iface=true] > -) > - > ovn-nbctl --wait=hv meter-add meter0 drop 100 pktps 10 > > OVN_CONTROLLER_EXPECT_NO_HIT( > -- > 2.39.2 > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
