From: Alex Wang <alexw@nicira.com>
Date: Sun, 16 Aug 2015 06:52:42 +0000 (-0700)
Subject: ovn-sbctl: Make 'chassis-del' delete all encaps.
X-Git-Tag: v2.5.0~738
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=3b74b8c050a56b4d284d984de87b21114560f917;p=cascardo%2Fovs.git

ovn-sbctl: Make 'chassis-del' delete all encaps.

Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Russell Bryant <rbryant@redhat.com>
---

diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c
index 8887c95c3..c69800a3a 100644
--- a/ovn/utilities/ovn-sbctl.c
+++ b/ovn/utilities/ovn-sbctl.c
@@ -548,6 +548,11 @@ cmd_chassis_del(struct ctl_context *ctx)
     sbctl_ch = find_chassis(sbctl_ctx, ctx->argv[1], must_exist);
     if (sbctl_ch) {
         if (sbctl_ch->ch_cfg) {
+            size_t i;
+
+            for (i = 0; i < sbctl_ch->ch_cfg->n_encaps; i++) {
+                sbrec_encap_delete(sbctl_ch->ch_cfg->encaps[i]);
+            }
             sbrec_chassis_delete(sbctl_ch->ch_cfg);
         }
         shash_find_and_delete(&sbctl_ctx->chassis, ctx->argv[1]);