| Message ID | 20220811142001.106287-3-amusil@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | MAC binding aging mechanism | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
Acked-by: Mark Michelson <mmichels@redhat.com> On 8/11/22 10:19, Ales Musil wrote: > Add helper source file for creating index > over MAC binding table. > > Reported-at: https://bugzilla.redhat.com/2084668 > Acked-by: Dumitru Ceara <dceara@redhat.com> > Signed-off-by: Ales Musil <amusil@redhat.com> > --- > v4: Rebase on top of current main. > Address comment from Mark. > Add ack from Ihar. > v5: Rebase on top of current main. > Address comments from Dumitru. > --- > controller/ovn-controller.c | 8 +++----- > lib/automake.mk | 2 ++ > lib/mac-binding-index.c | 33 +++++++++++++++++++++++++++++++++ > lib/mac-binding-index.h | 26 ++++++++++++++++++++++++++ > 4 files changed, 64 insertions(+), 5 deletions(-) > create mode 100644 lib/mac-binding-index.c > create mode 100644 lib/mac-binding-index.h > > diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c > index 8268726e6..6850bc7fb 100644 > --- a/controller/ovn-controller.c > +++ b/controller/ovn-controller.c > @@ -53,6 +53,7 @@ > #include "lib/chassis-index.h" > #include "lib/extend-table.h" > #include "lib/ip-mcast-index.h" > +#include "lib/mac-binding-index.h" > #include "lib/mcast-group-index.h" > #include "lib/ovn-sb-idl.h" > #include "lib/ovn-util.h" > @@ -3496,9 +3497,7 @@ main(int argc, char *argv[]) > = ovsdb_idl_index_create1(ovnsb_idl_loop.idl, > &sbrec_datapath_binding_col_tunnel_key); > struct ovsdb_idl_index *sbrec_mac_binding_by_lport_ip > - = ovsdb_idl_index_create2(ovnsb_idl_loop.idl, > - &sbrec_mac_binding_col_logical_port, > - &sbrec_mac_binding_col_ip); > + = mac_binding_by_lport_ip_index_create(ovnsb_idl_loop.idl); > struct ovsdb_idl_index *sbrec_ip_multicast > = ip_mcast_index_create(ovnsb_idl_loop.idl); > struct ovsdb_idl_index *sbrec_igmp_group > @@ -3511,8 +3510,7 @@ main(int argc, char *argv[]) > &sbrec_fdb_col_mac, > &sbrec_fdb_col_dp_key); > struct ovsdb_idl_index *sbrec_mac_binding_by_datapath > - = ovsdb_idl_index_create1(ovnsb_idl_loop.idl, > - &sbrec_mac_binding_col_datapath); > + = mac_binding_by_datapath_index_create(ovnsb_idl_loop.idl); > struct ovsdb_idl_index *sbrec_static_mac_binding_by_datapath > = ovsdb_idl_index_create1(ovnsb_idl_loop.idl, > &sbrec_static_mac_binding_col_datapath); > diff --git a/lib/automake.mk b/lib/automake.mk > index 3a2da1fe4..60bead6a6 100644 > --- a/lib/automake.mk > +++ b/lib/automake.mk > @@ -26,6 +26,8 @@ lib_libovn_la_SOURCES = \ > lib/ovn-parallel-hmap.c \ > lib/ip-mcast-index.c \ > lib/ip-mcast-index.h \ > + lib/mac-binding-index.c \ > + lib/mac-binding-index.h \ > lib/mcast-group-index.c \ > lib/mcast-group-index.h \ > lib/lex.c \ > diff --git a/lib/mac-binding-index.c b/lib/mac-binding-index.c > new file mode 100644 > index 000000000..d774f12d0 > --- /dev/null > +++ b/lib/mac-binding-index.c > @@ -0,0 +1,33 @@ > +/* Copyright (c) 2022, Red Hat, Inc. > + * > + * Licensed under the Apache License, Version 2.0 (the "License"); > + * you may not use this file except in compliance with the License. > + * You may obtain a copy of the License at: > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, software > + * distributed under the License is distributed on an "AS IS" BASIS, > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > + * See the License for the specific language governing permissions and > + * limitations under the License. > + */ > + > +#include <config.h> > + > +#include "lib/mac-binding-index.h" > +#include "lib/ovn-sb-idl.h" > + > +struct ovsdb_idl_index * > +mac_binding_by_datapath_index_create(struct ovsdb_idl *idl) > +{ > + return ovsdb_idl_index_create1(idl, &sbrec_mac_binding_col_datapath); > +} > + > +struct ovsdb_idl_index * > +mac_binding_by_lport_ip_index_create(struct ovsdb_idl *idl) > +{ > + return ovsdb_idl_index_create2(idl, > + &sbrec_mac_binding_col_logical_port, > + &sbrec_mac_binding_col_ip); > +} > diff --git a/lib/mac-binding-index.h b/lib/mac-binding-index.h > new file mode 100644 > index 000000000..8e977ecea > --- /dev/null > +++ b/lib/mac-binding-index.h > @@ -0,0 +1,26 @@ > +/* Copyright (c) 2022, Red Hat, Inc. > + * > + * Licensed under the Apache License, Version 2.0 (the "License"); > + * you may not use this file except in compliance with the License. > + * You may obtain a copy of the License at: > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, software > + * distributed under the License is distributed on an "AS IS" BASIS, > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > + * See the License for the specific language governing permissions and > + * limitations under the License. > + */ > + > +#ifndef OVN_MAC_BINDING_INDEX_H > +#define OVN_MAC_BINDING_INDEX_H 1 > + > +#include "lib/ovn-sb-idl.h" > + > +struct ovsdb_idl_index *mac_binding_by_datapath_index_create( > + struct ovsdb_idl *idl); > +struct ovsdb_idl_index *mac_binding_by_lport_ip_index_create( > + struct ovsdb_idl *idl); > + > +#endif /* lib/mac-binding-index.h */
diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 8268726e6..6850bc7fb 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -53,6 +53,7 @@ #include "lib/chassis-index.h" #include "lib/extend-table.h" #include "lib/ip-mcast-index.h" +#include "lib/mac-binding-index.h" #include "lib/mcast-group-index.h" #include "lib/ovn-sb-idl.h" #include "lib/ovn-util.h" @@ -3496,9 +3497,7 @@ main(int argc, char *argv[]) = ovsdb_idl_index_create1(ovnsb_idl_loop.idl, &sbrec_datapath_binding_col_tunnel_key); struct ovsdb_idl_index *sbrec_mac_binding_by_lport_ip - = ovsdb_idl_index_create2(ovnsb_idl_loop.idl, - &sbrec_mac_binding_col_logical_port, - &sbrec_mac_binding_col_ip); + = mac_binding_by_lport_ip_index_create(ovnsb_idl_loop.idl); struct ovsdb_idl_index *sbrec_ip_multicast = ip_mcast_index_create(ovnsb_idl_loop.idl); struct ovsdb_idl_index *sbrec_igmp_group @@ -3511,8 +3510,7 @@ main(int argc, char *argv[]) &sbrec_fdb_col_mac, &sbrec_fdb_col_dp_key); struct ovsdb_idl_index *sbrec_mac_binding_by_datapath - = ovsdb_idl_index_create1(ovnsb_idl_loop.idl, - &sbrec_mac_binding_col_datapath); + = mac_binding_by_datapath_index_create(ovnsb_idl_loop.idl); struct ovsdb_idl_index *sbrec_static_mac_binding_by_datapath = ovsdb_idl_index_create1(ovnsb_idl_loop.idl, &sbrec_static_mac_binding_col_datapath); diff --git a/lib/automake.mk b/lib/automake.mk index 3a2da1fe4..60bead6a6 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -26,6 +26,8 @@ lib_libovn_la_SOURCES = \ lib/ovn-parallel-hmap.c \ lib/ip-mcast-index.c \ lib/ip-mcast-index.h \ + lib/mac-binding-index.c \ + lib/mac-binding-index.h \ lib/mcast-group-index.c \ lib/mcast-group-index.h \ lib/lex.c \ diff --git a/lib/mac-binding-index.c b/lib/mac-binding-index.c new file mode 100644 index 000000000..d774f12d0 --- /dev/null +++ b/lib/mac-binding-index.c @@ -0,0 +1,33 @@ +/* Copyright (c) 2022, Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <config.h> + +#include "lib/mac-binding-index.h" +#include "lib/ovn-sb-idl.h" + +struct ovsdb_idl_index * +mac_binding_by_datapath_index_create(struct ovsdb_idl *idl) +{ + return ovsdb_idl_index_create1(idl, &sbrec_mac_binding_col_datapath); +} + +struct ovsdb_idl_index * +mac_binding_by_lport_ip_index_create(struct ovsdb_idl *idl) +{ + return ovsdb_idl_index_create2(idl, + &sbrec_mac_binding_col_logical_port, + &sbrec_mac_binding_col_ip); +} diff --git a/lib/mac-binding-index.h b/lib/mac-binding-index.h new file mode 100644 index 000000000..8e977ecea --- /dev/null +++ b/lib/mac-binding-index.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2022, Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OVN_MAC_BINDING_INDEX_H +#define OVN_MAC_BINDING_INDEX_H 1 + +#include "lib/ovn-sb-idl.h" + +struct ovsdb_idl_index *mac_binding_by_datapath_index_create( + struct ovsdb_idl *idl); +struct ovsdb_idl_index *mac_binding_by_lport_ip_index_create( + struct ovsdb_idl *idl); + +#endif /* lib/mac-binding-index.h */