Re: [ovs-dev] [PATCH] ovn: change load balancer references to weak in NB schema

2019-02-11 Thread Ben Pfaff
Thanks Daniel (and Lucas).  I applied this to master.

On Mon, Feb 11, 2019 at 04:13:39PM +, Lucas Alvares Gomes wrote:
> Thanks Daniel,I agree it makes things easier for the integration with 
> OpenStack.
> On Mon, Feb 11, 2019 at 4:07 PM Daniel Alvarez  wrote:
> >
> > When a load balancer is added to multiple logical switches
> > and routers it has be to be removed from all of them before
> > being able to delete due to the current 'strong' reference
> > in the NB schema.
> >
> > By changing it to 'weak', users can simply remove the load
> > balancer without having to remove all the references manually.
> > In particular, this will make things easier for networking-ovn,
> > the OpenStack integration project as it'll save some
> > calculations upon load balancer deletion.
> >
> > The update path has been successfully from the previous version
> > of the schema.
> >
> > Signed-off-by: Daniel Alvarez 
> > ---
> >  ovn/ovn-nb.ovsschema |  8 
> >  tests/ovn-nbctl.at   | 10 +-
> >  2 files changed, 13 insertions(+), 5 deletions(-)
> >
> > diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
> > index f3683df14..10a59649a 100644
> > --- a/ovn/ovn-nb.ovsschema
> > +++ b/ovn/ovn-nb.ovsschema
> > @@ -1,7 +1,7 @@
> >  {
> >  "name": "OVN_Northbound",
> > -"version": "5.14.0",
> > -"cksum": "3600467067 20513",
> > +"version": "5.14.1",
> > +"cksum": "3758097843 20509",
> >  "tables": {
> >  "NB_Global": {
> >  "columns": {
> > @@ -46,7 +46,7 @@
> >"max": "unlimited"}},
> >  "load_balancer": {"type": {"key": {"type": "uuid",
> >"refTable": 
> > "Load_Balancer",
> > -  "refType": "strong"},
> > +  "refType": "weak"},
> > "min": 0,
> > "max": "unlimited"}},
> >  "dns_records": {"type": {"key": {"type": "uuid",
> > @@ -250,7 +250,7 @@
> >   "max": "unlimited"}},
> >  "load_balancer": {"type": {"key": {"type": "uuid",
> >"refTable": 
> > "Load_Balancer",
> > -  "refType": "strong"},
> > +  "refType": "weak"},
> > "min": 0,
> > "max": "unlimited"}},
> >  "options": {
> > diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at
> > index f55277cee..7a5903c3a 100644
> > --- a/tests/ovn-nbctl.at
> > +++ b/tests/ovn-nbctl.at
> > @@ -752,7 +752,15 @@ AT_CHECK([ovn-nbctl lr-lb-add lr0 lb0])
> >  AT_CHECK([ovn-nbctl lr-lb-add lr0 lb1])
> >  AT_CHECK([ovn-nbctl lr-lb-add lr0 lb3])
> >  AT_CHECK([ovn-nbctl lr-lb-del lr0])
> > -AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])])
> > +AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])
> > +
> > +dnl Remove load balancers after adding them to a logical router/switch.
> > +AT_CHECK([ovn-nbctl lr-lb-add lr0 lb0])
> > +AT_CHECK([ovn-nbctl ls-lb-add ls0 lb1])
> > +AT_CHECK([ovn-nbctl lb-del lb0])
> > +AT_CHECK([ovn-nbctl lb-del lb1])
> > +AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])
> > +AT_CHECK([ovn-nbctl ls-lb-list ls0 | uuidfilt], [0], [])])
> >
> >  dnl -
> >
> > --
> > 2.17.2 (Apple Git-113)
> >
> > ___
> > dev mailing list
> > d...@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> 
> Acked-By: Lucas Alvares Gomes 
> ___
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


Re: [ovs-dev] [PATCH] ovn: change load balancer references to weak in NB schema

2019-02-11 Thread Lucas Alvares Gomes
Thanks Daniel,I agree it makes things easier for the integration with OpenStack.
On Mon, Feb 11, 2019 at 4:07 PM Daniel Alvarez  wrote:
>
> When a load balancer is added to multiple logical switches
> and routers it has be to be removed from all of them before
> being able to delete due to the current 'strong' reference
> in the NB schema.
>
> By changing it to 'weak', users can simply remove the load
> balancer without having to remove all the references manually.
> In particular, this will make things easier for networking-ovn,
> the OpenStack integration project as it'll save some
> calculations upon load balancer deletion.
>
> The update path has been successfully from the previous version
> of the schema.
>
> Signed-off-by: Daniel Alvarez 
> ---
>  ovn/ovn-nb.ovsschema |  8 
>  tests/ovn-nbctl.at   | 10 +-
>  2 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
> index f3683df14..10a59649a 100644
> --- a/ovn/ovn-nb.ovsschema
> +++ b/ovn/ovn-nb.ovsschema
> @@ -1,7 +1,7 @@
>  {
>  "name": "OVN_Northbound",
> -"version": "5.14.0",
> -"cksum": "3600467067 20513",
> +"version": "5.14.1",
> +"cksum": "3758097843 20509",
>  "tables": {
>  "NB_Global": {
>  "columns": {
> @@ -46,7 +46,7 @@
>"max": "unlimited"}},
>  "load_balancer": {"type": {"key": {"type": "uuid",
>"refTable": 
> "Load_Balancer",
> -  "refType": "strong"},
> +  "refType": "weak"},
> "min": 0,
> "max": "unlimited"}},
>  "dns_records": {"type": {"key": {"type": "uuid",
> @@ -250,7 +250,7 @@
>   "max": "unlimited"}},
>  "load_balancer": {"type": {"key": {"type": "uuid",
>"refTable": 
> "Load_Balancer",
> -  "refType": "strong"},
> +  "refType": "weak"},
> "min": 0,
> "max": "unlimited"}},
>  "options": {
> diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at
> index f55277cee..7a5903c3a 100644
> --- a/tests/ovn-nbctl.at
> +++ b/tests/ovn-nbctl.at
> @@ -752,7 +752,15 @@ AT_CHECK([ovn-nbctl lr-lb-add lr0 lb0])
>  AT_CHECK([ovn-nbctl lr-lb-add lr0 lb1])
>  AT_CHECK([ovn-nbctl lr-lb-add lr0 lb3])
>  AT_CHECK([ovn-nbctl lr-lb-del lr0])
> -AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])])
> +AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])
> +
> +dnl Remove load balancers after adding them to a logical router/switch.
> +AT_CHECK([ovn-nbctl lr-lb-add lr0 lb0])
> +AT_CHECK([ovn-nbctl ls-lb-add ls0 lb1])
> +AT_CHECK([ovn-nbctl lb-del lb0])
> +AT_CHECK([ovn-nbctl lb-del lb1])
> +AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])
> +AT_CHECK([ovn-nbctl ls-lb-list ls0 | uuidfilt], [0], [])])
>
>  dnl -
>
> --
> 2.17.2 (Apple Git-113)
>
> ___
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Acked-By: Lucas Alvares Gomes 
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


[ovs-dev] [PATCH] ovn: change load balancer references to weak in NB schema

2019-02-11 Thread Daniel Alvarez
When a load balancer is added to multiple logical switches
and routers it has be to be removed from all of them before
being able to delete due to the current 'strong' reference
in the NB schema.

By changing it to 'weak', users can simply remove the load
balancer without having to remove all the references manually.
In particular, this will make things easier for networking-ovn,
the OpenStack integration project as it'll save some
calculations upon load balancer deletion.

The update path has been successfully from the previous version
of the schema.

Signed-off-by: Daniel Alvarez 
---
 ovn/ovn-nb.ovsschema |  8 
 tests/ovn-nbctl.at   | 10 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
index f3683df14..10a59649a 100644
--- a/ovn/ovn-nb.ovsschema
+++ b/ovn/ovn-nb.ovsschema
@@ -1,7 +1,7 @@
 {
 "name": "OVN_Northbound",
-"version": "5.14.0",
-"cksum": "3600467067 20513",
+"version": "5.14.1",
+"cksum": "3758097843 20509",
 "tables": {
 "NB_Global": {
 "columns": {
@@ -46,7 +46,7 @@
   "max": "unlimited"}},
 "load_balancer": {"type": {"key": {"type": "uuid",
   "refTable": "Load_Balancer",
-  "refType": "strong"},
+  "refType": "weak"},
"min": 0,
"max": "unlimited"}},
 "dns_records": {"type": {"key": {"type": "uuid",
@@ -250,7 +250,7 @@
  "max": "unlimited"}},
 "load_balancer": {"type": {"key": {"type": "uuid",
   "refTable": "Load_Balancer",
-  "refType": "strong"},
+  "refType": "weak"},
"min": 0,
"max": "unlimited"}},
 "options": {
diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at
index f55277cee..7a5903c3a 100644
--- a/tests/ovn-nbctl.at
+++ b/tests/ovn-nbctl.at
@@ -752,7 +752,15 @@ AT_CHECK([ovn-nbctl lr-lb-add lr0 lb0])
 AT_CHECK([ovn-nbctl lr-lb-add lr0 lb1])
 AT_CHECK([ovn-nbctl lr-lb-add lr0 lb3])
 AT_CHECK([ovn-nbctl lr-lb-del lr0])
-AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])])
+AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])
+
+dnl Remove load balancers after adding them to a logical router/switch.
+AT_CHECK([ovn-nbctl lr-lb-add lr0 lb0])
+AT_CHECK([ovn-nbctl ls-lb-add ls0 lb1])
+AT_CHECK([ovn-nbctl lb-del lb0])
+AT_CHECK([ovn-nbctl lb-del lb1])
+AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [])
+AT_CHECK([ovn-nbctl ls-lb-list ls0 | uuidfilt], [0], [])])
 
 dnl -
 
-- 
2.17.2 (Apple Git-113)

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev