xenserver: Fix key used to identify network UUID

The "dump-vif-details" script adds the network UUID to the
ovs-vswitchd.conf file.  Unfortunately, it wrote the key as
"network-uuid", but the code that retrieves it for the management
protocol checked our "net-uuid".  The script now uses the key
"net-uuid".

Thanks to Natasha for catching the problem.

diff --git a/xenserver/root_vswitch_scripts_dump-vif-details b/xenserver/root_vswitch_scripts_dump-vif-details
index 8ec845f1a0151b9f912905b1096200d44ad71153..b0ceb4054fe05033f7810770071b55e22008d8be 100755 (executable)
--- a/xenserver/root_vswitch_scripts_dump-vif-details
+++ b/xenserver/root_vswitch_scripts_dump-vif-details
@@ -33,7 +33,7 @@ def dump_vif_info(domid, devid, vif_ref):
                vm_rec = session.xenapi.VM.get_record(vif_rec["VM"])
 
                # Data to allow vNetManager to associate VIFs with xapi data
-               sys.stdout.write('--add=port.vif%s.%s.network-uuid=%s ' 
+               sys.stdout.write('--add=port.vif%s.%s.net-uuid=%s ' 
                                % (domid, devid, net_rec["uuid"]))
                sys.stdout.write('--add=port.vif%s.%s.vif-mac=%s ' 
                                % (domid, devid, vif_rec["MAC"]))