From 2a577bd807023009afab02d975787d67389c4a27 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Tue, 3 Nov 2009 21:19:47 -0800 Subject: [PATCH] xenserver: Fix issue with deleting network UUID on VLAN destruction In XenServer, a VLAN is considered an additional network with its own UUID. The interface-reconfigure script properly adds this network UUID to the configuration script, but commit 774428 removed the code that would remove this information on VLAN destruction. Ian Campbell was the author of that commit and felt that reverting this part was safe. Bug #1973 --- xenserver/opt_xensource_libexec_interface-reconfigure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure index 82c386368..59036a561 100755 --- a/xenserver/opt_xensource_libexec_interface-reconfigure +++ b/xenserver/opt_xensource_libexec_interface-reconfigure @@ -1518,10 +1518,10 @@ def action_down(pif): ifdown(ipdev) if dp: - #nw = db.get_pif_record(pif)['network'] - #nwrec = db.get_network_record(nw) - #cfgmod_argv += ['# deconfigure xs-network-uuids'] - #cfgmod_argv += ['--del-entry=bridge.%s.xs-network-uuids=%s' % (bridge,nwrec['uuid'])] + nw = db.get_pif_record(pif)['network'] + nwrec = db.get_network_record(nw) + cfgmod_argv += ['# deconfigure xs-network-uuids'] + cfgmod_argv += ['--del-entry=bridge.%s.xs-network-uuids=%s' % (bridge,nwrec['uuid'])] log("deconfigure ipdev %s on %s" % (ipdev,bridge)) cfgmod_argv += ["# deconfigure ipdev %s" % ipdev] -- 2.43.0