From 612f80fa8ebf88dad2e204364c6c02b451dca36c Mon Sep 17 00:00:00 2001 From: Daniel Alvarez Date: Mon, 11 Feb 2019 17:06:14 +0100 Subject: [PATCH] ovn: change load balancer references to weak in NB schema 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. Acked-by: Lucas Alvares Gomes Signed-off-by: Daniel Alvarez Signed-off-by: Ben Pfaff --- 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.39.5