Alex, thanks for the review. I will push it in a minute, and back port to branch 2.3.
On Mon, Oct 6, 2014 at 9:36 AM, Alex Wang <al...@nicira.com> wrote: > Thx for fixing this, > > >> >> +#include "lib/vswitch-idl.h" >> > > This could be removed, Done. > > >> >> VLOG_DEFINE_THIS_MODULE(bond); >> >> @@ -131,6 +132,15 @@ struct bond { >> uint32_t recirc_id; /* Non zero if recirculation can be >> used.*/ >> struct hmap pr_rule_ops; /* Helps to maintain post recirculation >> rules.*/ >> >> + /* Sotre active slave to OVSDB. */ > > > s/Sotre/store/ > Fixed. > >> >> + /* copy the default active inerface MAC address from OVSDB. */ >> + memcpy(bond->active_slave_mac, s->active_slave_mac, >> + sizeof s->active_slave_mac); > > > s/inerface/interface I decide to remove the comment. It does not add useful information. > > >> >> /* Returns true if 'port' is synthetic, that is, if we constructed it >> locally >> diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema >> index 3d78f1d..eb4a112 100644 >> --- a/vswitchd/vswitch.ovsschema >> +++ b/vswitchd/vswitch.ovsschema >> @@ -1,6 +1,6 @@ >> {"name": "Open_vSwitch", >> - "version": "7.9.0", >> - "cksum": "2301439325 21345", >> + "version": "8.0.0", >> + "cksum": "867114045 21497", >> "tables": { >> "Open_vSwitch": { >> "columns": { >> @@ -160,6 +160,10 @@ >> "type": "integer"}, >> "bond_downdelay": { >> "type": "integer"}, >> + "bond_active_slave": { >> + "type": {"key": {"type": "string"}, >> + "min": 0, "max": 1}, >> + "ephemeral": true}, >> "bond_fake_iface": { >> "type": "boolean"}, >> "fake_bridge": { >> diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml >> index dca5439..59085fa 100644 >> --- a/vswitchd/vswitch.xml >> +++ b/vswitchd/vswitch.xml >> @@ -1257,6 +1257,10 @@ >> </column> >> </group> >> >> + <column name="bond_active_slave"> >> + For a bonded port, record the mac address of the current active >> slave. >> + </column> >> + >> <column name="bond_fake_iface"> >> For a bonded port, whether to create a fake internal interface >> with the >> name of the port. Use only for compatibility with legacy >> software that >> -- >> 1.9.1 > > > Not very familiar with the documentation format, > > Should we put bond_fake_iface inside 'status' column? Or we want to allow > user modify it? Do you mean bond_active_slave? Yes, put it in status colume makes more sense. I will move it there. > > > Acked-by: Alex Wang <al...@nicira.com> > > > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev