Adapt to OpenNebula 4.10, make USER_TEMPLATE accessible in VMs.

michael-os · michael-os · commit 63c296561da9 · 2015-04-28T18:18:14.000+02:00
diff --git a/oca/host.py b/oca/host.py
@@ -36,8 +36,8 @@ class Host(PoolElement):
         'state'         : int,
         'im_mad'        : str,
         'vm_mad'        : str,
-        'tm_mad'        : str,
         'last_mon_time' : int,
+        'vm_ids'        : ['VMS', lambda vms: map(lambda vmid: int(vmid.text), vms)],
         'template'      : ['TEMPLATE', Template],
         'host_share'    : ['HOST_SHARE', HostShare],
     }
diff --git a/oca/vm.py b/oca/vm.py
@@ -95,6 +95,7 @@ class VirtualMachine(PoolElement):
         'net_tx'       : int,
         'net_rx'       : int,
         'template'     : ['TEMPLATE', Template, ['NIC', 'DISK']],
+        'user_template': ['USER_TEMPLATE', Template],
         'history_records' : ['HISTORY_RECORDS', lambda x: [History(i)
                                         for i in x] if x is not None else []],
     }

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ class VirtualMachine(PoolElement):`
`95`	`95`	`'net_tx' : int,`
`96`	`96`	`'net_rx' : int,`
`97`	`97`	`'template' : ['TEMPLATE', Template, ['NIC', 'DISK']],`
	`98`	`+ 'user_template': ['USER_TEMPLATE', Template],`
`98`	`99`	`'history_records' : ['HISTORY_RECORDS', lambda x: [History(i)`
`99`	`100`	`for i in x] if x is not None else []],`
`100`	`101`	`}`