[kernel] r10611 - people/waldi/dkt/lib/dkt/imageconfig

[Bastian Blank]

Author: waldi
Date: Tue Feb 19 18:07:09 2008
New Revision: 10611

Log:
* lib/dkt/imageconfig/__init__.py: Update.
* lib/dkt/imageconfig/interfaces.py: Update.
* lib/dkt/imageconfig/xen.py: Move from lib/dkt/imageconfig/linux_xen.py.


Added:
   people/waldi/dkt/lib/dkt/imageconfig/xen.py
      - copied, changed from r10329, /people/waldi/dkt/lib/dkt/imageconfig/linux_xen.py
Removed:
   people/waldi/dkt/lib/dkt/imageconfig/linux_xen.py
Modified:
   people/waldi/dkt/lib/dkt/imageconfig/__init__.py
   people/waldi/dkt/lib/dkt/imageconfig/interfaces.py

Modified: people/waldi/dkt/lib/dkt/imageconfig/__init__.py
==============================================================================
--- people/waldi/dkt/lib/dkt/imageconfig/__init__.py	(original)
+++ people/waldi/dkt/lib/dkt/imageconfig/__init__.py	Tue Feb 19 18:07:09 2008
@@ -1,4 +1,4 @@
 #from __future__ import absolute_import
 
 #from . import base, linux_initramfs, linux_xen
-import base, linux_initramfs, linux_xen
+import base, linux_initramfs, xen

Modified: people/waldi/dkt/lib/dkt/imageconfig/interfaces.py
==============================================================================
--- people/waldi/dkt/lib/dkt/imageconfig/interfaces.py	(original)
+++ people/waldi/dkt/lib/dkt/imageconfig/interfaces.py	Tue Feb 19 18:07:09 2008
@@ -14,6 +14,6 @@
 class IImageLinuxInitramfsConfig(Interface):
     pass
 
-class IImageLinuxXenConfig(Interface):
+class IImageXenConfig(Interface):
     pass
 

Copied: people/waldi/dkt/lib/dkt/imageconfig/xen.py (from r10329, /people/waldi/dkt/lib/dkt/imageconfig/linux_xen.py)
==============================================================================
--- /people/waldi/dkt/lib/dkt/imageconfig/linux_xen.py	(original)
+++ people/waldi/dkt/lib/dkt/imageconfig/xen.py	Tue Feb 19 18:07:09 2008
@@ -6,16 +6,16 @@
 from dkt.interface import implements
 from dkt.interface.adapter import registry
 
-class ImageLinuxXenConfig(object):
-    implements(interfaces.IImageLinuxXenConfig)
+class ImageXenConfig(object):
+    implements(interfaces.IImageXenConfig)
 
     @classmethod
     def _factory(cls, context):
-        if 'image' not in context or context.get('image', 'type', None) != 'linux' or 'xen' not in context:
+        if 'image' not in context or 'xen' not in context:
             return None
         return cls(context)
 
     def __init__(self, context):
         self.context = context
 
-registry.register([config_interfaces.IConfig], interfaces.IImageLinuxXenConfig, '', ImageLinuxXenConfig._factory)
+registry.register([config_interfaces.IConfig], interfaces.IImageXenConfig, '', ImageXenConfig._factory)