Attachment 2591 Details for Bug 19449 – Interface model

[patch] Interface model

interface-model.patch (text/plain), 1.77 KB, created by Andreas Büsching on 2010-08-13 20:46:11 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Büsching

Created: 2010-08-13 20:46:11 CEST

Size: 1.77 KB

patch

obsolete

>Index: umc/modules/univention/management/console/handlers/uvmm/__init__.py
>===================================================================
>--- umc/modules/univention/management/console/handlers/uvmm/__init__.py	(Revision 19219)
>+++ umc/modules/univention/management/console/handlers/uvmm/__init__.py	(Arbeitskopie)
>@@ -822,7 +822,10 @@
> 		domain.maxMem = MemorySize.str2num( object.options[ 'memory' ] )
> 
> 		# interface
>-		iface = uuv_node.Interface()
>+		if domain_info and domain_info.interfaces:
>+			iface = domain_info.interfaces[ 0 ]
>+		else:
>+			iface = uuv_node.Interface()
> 		iface.mac_address = handler._getstr( object, 'mac' )
> 		iface.source = handler._getstr( object, 'interface' )
> 		domain.interfaces.append( iface )
>Index: src/univention/uvmm/node.py
>===================================================================
>--- src/univention/uvmm/node.py	(Revision 19218)
>+++ src/univention/uvmm/node.py	(Arbeitskopie)
>@@ -124,6 +124,7 @@
> 		self.source = None
> 		self.target = None
> 		self.script = None
>+		self.model = None
> 
> 	@staticmethod
> 	def map_type( id = None, name = None ):
>@@ -394,6 +395,9 @@
> 			target = iface.getElementsByTagName( 'target' )
> 			if target:
> 				dev.target_dev = target[ 0 ].getAttribute( 'dev' )
>+			model = iface.getElementsByTagName( 'model' )
>+			if model:
>+				dev.model = model[ 0 ].getAttribute( 'type' )
> 
> 			self.pd.interfaces.append(dev)
> 
>@@ -880,6 +884,10 @@
> 			target = doc.createElement( 'target' )
> 			target.setAttribute( 'dev', iface.target )
> 			elem.appendChild( target )
>+		if iface.model:
>+			model = doc.createElement( 'model' )
>+			model.setAttribute( 'type', iface.model )
>+			elem.appendChild( model )
> 		devices.appendChild( elem )
> 
>   	# define a tablet usb device which has absolute cursor movement for a better VNC experience. Bug #19244

Actions: View | Diff

Attachments on bug 19449: 2591