Image creation patches

[Bryan Kearney]

Two patches for image creation. The first one modifies cobbler to add a
"network_count" attribute. It holds the number of NICS required to provision the
imge. The second is for koan which uses the image metadata to drive the virt-image
libraries.

[PATCH] Added an attribute network_count to images to hold the number of required NICS to provision the image

[Bryan Kearney]

---
 cobbler/item_image.py           |   11 ++++++++++-
 cobbler/webui/CobblerWeb.py     |    4 +++-
 webui_templates/image_edit.tmpl |   16 ++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/cobbler/item_image.py b/cobbler/item_image.py
index 3acd93c..0ff9ec3 100644
--- a/cobbler/item_image.py
+++ b/cobbler/item_image.py
@@ -53,6 +53,7 @@ class Image(item.Item):
         self.virt_path       = ''
         self.virt_type       = self.settings.default_virt_type
         self.virt_cpus       = 1
+        self.network_count   = 1
         self.virt_bridge     = self.settings.default_virt_bridge
         self.owners          = self.settings.default_ownership
         self.image_type      = "iso" # direct, iso, memdisk, virt-clone
@@ -78,7 +79,8 @@ class Image(item.Item):
         self.virt_path       = self.load_item(seed_data, 'virt_path')
         self.virt_type       = self.load_item(seed_data, 'virt_type',
self.settings.default_virt_type)
         self.virt_cpus       = self.load_item(seed_data, 'virt_cpus')
-        self.virt_bridge     = self.load_item(seed_data, 'virt_bridge',
self.settings.default_virt_bridge)
+        self.network_count   = self.load_item(seed_data, 'network_count')
+        self.virt_bridge     = self.load_item(seed_data, 'virt_bridge')
         self.arch            = self.load_item(seed_data,'arch','i386')
 
         self.image_type      = self.load_item(seed_data, 'image_type',
'iso')
@@ -134,6 +136,10 @@ class Image(item.Item):
 
     def set_virt_cpus(self,num):
         return utils.set_virt_cpus(self,num)
+        
+    def set_network_count(self, num):
+        self.network_count = num
+        return True
 
     def set_virt_file_size(self,num):
         return utils.set_virt_file_size(self,num)
@@ -182,6 +188,7 @@ class Image(item.Item):
             'virt_path'        : self.virt_path,
             'virt_type'        : self.virt_type,
             'virt_cpus'        : self.virt_cpus,
+            'network_count'    : self.network_count,
             'virt_bridge'      : self.virt_bridge,
             'virt_file_size'   : self.virt_file_size,
             'breed'            : self.breed,
@@ -207,6 +214,7 @@ class Image(item.Item):
         buf = buf + _("owners          : %s\n") % self.owners
         buf = buf + _("virt bridge     : %s\n") % self.virt_bridge
         buf = buf + _("virt cpus       : %s\n") % self.virt_cpus
+        buf = buf + _("network count   : %s\n") % self.network_count
         buf = buf + _("virt file size  : %s\n") % self.virt_file_size
         buf = buf + _("virt path       : %s\n") % self.virt_path
         buf = buf + _("virt ram        : %s\n") % self.virt_ram
@@ -224,6 +232,7 @@ class Image(item.Item):
             'file'            :  self.set_file,
             'owners'          :  self.set_owners,
             'virt-cpus'       :  self.set_virt_cpus,
+            'network-count'   :  self.set_network_count,
             'virt-file-size'  :  self.set_virt_file_size,
             'virt-bridge'     :  self.set_virt_bridge,
             'virt-path'       :  self.set_virt_path,
diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py
index 0cb44fc..e996197 100644
--- a/cobbler/webui/CobblerWeb.py
+++ b/cobbler/webui/CobblerWeb.py
@@ -809,7 +809,7 @@ class CobblerWeb(object):
     def
image_save(self,name=None,comment=None,oldname=None,new_or_edit=None,editmode='edit',field1=None,
                   
file=None,arch=None,breed=None,virtram=None,virtfilesize=None,virtpath=None,
                   
virttype=None,virtcpus=None,virtbridge=None,imagetype=None,owners=None,
-                   osversion=None,delete1=None,delete2=None,recursive=False,**args):
+                  
osversion=None,delete1=None,delete2=None,recursive=False,networkcount=None,**args):
 
         if not self.__xmlrpc_setup():
             return self.xmlrpc_auth_failure()
@@ -865,6 +865,8 @@ class CobblerWeb(object):
                 self.remote.modify_image(image, 'owners',     owners,   
self.token)
             if virtcpus is not None:     
                 self.remote.modify_image(image, 'virt-cpus',  virtcpus, 
self.token)
+            if networkcount is not None:     
+                self.remote.modify_image(image, 'network-count',  networkcount, 
self.token)                
             if virtfilesize is not None: 
                 self.remote.modify_image(image, 'virt-file-size', virtfilesize,
self.token)
             if virtpath is not None:     
diff --git a/webui_templates/image_edit.tmpl b/webui_templates/image_edit.tmpl
index b34fb56..50f0342 100644
--- a/webui_templates/image_edit.tmpl
+++ b/webui_templates/image_edit.tmpl
@@ -290,6 +290,22 @@ function disablename(value)
     <p class="context-tip">How many virtual CPUs?  This is an
integer.</p>
     </td>
     </tr>
+    
+    ## self.network_count       = 1
+
+    <tr>
+    <td>
+    <label for="virtpath">NICs</label>
+    </td>
+    <td>
+    <input type="text" size="255" style="width: 150px;"
name="networkcount" id="networkcount"
+        #if $image
+           value="$image.network_count"
+        #end if
+    />
+    <p class="context-tip">How many nics should be created  This is an
integer.</p>
+    </td>
+    </tr>    
 
 
     ## self.virt_bridge     = self.settings.default_virt_bridge
-- 
1.5.6.5

[PATCH] add virt-image creation to koan

[Bryan Kearney]

---
 koan/app.py         |    3 +-
 koan/imagecreate.py |   65 ++++++++++++++++++++++++++++++++++----------------
 koan/qcreate.py     |    2 +-
 koan/vmwcreate.py   |    2 +-
 koan/xencreate.py   |    2 +-
 5 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/koan/app.py b/koan/app.py
index fe39992..5dc1717 100755
--- a/koan/app.py
+++ b/koan/app.py
@@ -1059,7 +1059,8 @@ class Koan:
                 arch          =  arch,
                 no_gfx        =  self.no_gfx,   
                 fullvirt      =  fullvirt,    
-                bridge        =  self.virt_bridge 
+                bridge        =  self.virt_bridge,
+                virt_type     =  self.virt_type
         )
 
         print results
diff --git a/koan/imagecreate.py b/koan/imagecreate.py
index 5664917..7c400a8 100644
--- a/koan/imagecreate.py
+++ b/koan/imagecreate.py
@@ -25,11 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 import os, sys, time, stat
 import shutil
-#import tempfile
 import random
 import exceptions
 import errno
-#import re
 import virtinst
 from virtinst import ImageParser, Guest, CapabilitiesParser, VirtualNetworkInterface
 import libvirt
@@ -81,17 +79,55 @@ def process_disk(image, boot, file, location, target):
     boot.disks.append(drive)
     #dev api
     #boot.drives.append(drive)  
+    
+    
+def process_networks(domain, guest, profile_data, bridge):
+    # Create a bridge or default network for every requested nic. If there are more
+    # bridges then nics discard the last one.
+    domain.interface = int(profile_data["network_count"])
+    bridges = []
+    #use the provided bridge first
+    guest_bridge = bridge
+    if guest_bridge is None:
+        guest_bridge = profile_data["virt_bridge"]
+        
+    # Look for commas
+    if (guest_bridge is not None) and (len(guest_bridge.strip()) > 0):
+        if guest_bridge.find(",") == -1:
+            bridges.append(guest_bridge)
+        else:
+            bridges == guest_bridge.split(",")
+    
+    for cnt in range(0,domain.interface):
+        if cnt < len(bridges):
+            nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge =
bridges[cnt])
+            #dev api
+            #nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge
= bridge, conn=guest.conn)                
+        else: 
+            default_network = virtinst.util.default_network()
+            #dev api
+            #default_network = virtinst.util.default_network(guest.conn)
+            nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
network=default_network[1])
+        guest.nics.append(nic)
 
 def start_install(name=None, ram=None, disks=None,
                            uuid=None,  
                            extra=None, 
                            vcpus=None,  
-                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
bridge=None):
-                   
-    print profile_data
+                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
bridge=None, virt_type=None):                 
+                           
     #FIXME how to do a non-default connection
     #Can we drive off of virt-type?
-    connection = libvirt.open(virtinst.util.default_connection())
+    connection = None
+    
+    if (virt_type is None ) or (virt_type == "auto"):
+        connection = virtinst.util.default_connection()
+    elif virt_type.lower()[0:3] == "xen":
+        connection = "xen"
+    else:
+        connection = "qemu:///system"
+        
+    connection = libvirt.open(connection)
     capabilities = virtinst.CapabilitiesParser.parse(connection.getCapabilities())   
     image_arch = transform_arch(arch)       
 
@@ -134,21 +170,8 @@ def start_install(name=None, ram=None, disks=None,
     if uuid is not None:
         guest.set_uuid(uuid)
                    
-    #Create a single NIC. If no bridge is provided, use the default network 
-    domain.interface = 1 
-    if bridge == None:
-        default_network = virtinst.util.default_network()
-        #dev api
-        #default_network = virtinst.util.default_network(guest.conn)
-        nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
network=default_network[1])
-        #dev api
-        #nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
network=default_network[1], conn=guest.conn)        
-    else:
-        nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge =
bridge)
-        #dev api
-        #nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge =
bridge, conn=guest.conn)        
-        
-    guest.nics.append(nic)
+    process_networks(domain, guest, profile_data, bridge)                   
+    
     guest.start_install()
     
     return "use virt-manager or reconnect with virsh console %s" % name 
diff --git a/koan/qcreate.py b/koan/qcreate.py
index e84ef69..bb3a9c2 100755
--- a/koan/qcreate.py
+++ b/koan/qcreate.py
@@ -55,7 +55,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
                   uuid=None,  
                   extra=None,
                   vcpus=None, 
-                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
bridge=None):
+                  profile_data=None, arch=None, no_gfx=False, fullvirt=True, bridge=None,
virt_type=None):
 
     vtype = "qemu"
     if virtinst.util.is_kvm_capable():
diff --git a/koan/vmwcreate.py b/koan/vmwcreate.py
index 1b8a4ff..f3c1581 100755
--- a/koan/vmwcreate.py
+++ b/koan/vmwcreate.py
@@ -121,7 +121,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
                   uuid=None,  
                   extra=None,
                   vcpus=None, 
-                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
bridge=None):
+                  profile_data=None, arch=None, no_gfx=False, fullvirt=True, bridge=None,
, virt_type=None):
 
     if profile_data.has_key("file"):
         raise koan.InfoException("vmware does not work with --image yet")
diff --git a/koan/xencreate.py b/koan/xencreate.py
index 807d744..21ce35b 100755
--- a/koan/xencreate.py
+++ b/koan/xencreate.py
@@ -62,7 +62,7 @@ def start_install(name=None, ram=None, disks=None,
                            uuid=None,  
                            extra=None, 
                            vcpus=None,  
-                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
bridge=None):
+                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
bridge=None, virt_type=None):
 
     if profile_data.has_key("file"):
         raise koan.InfoException("Xen does not work with --image yet")
-- 
1.5.6.5

[PATCH] add virt-image creation to koan

[Michael DeHaan]

Bryan Kearney wrote:
>  ---
>   koan/app.py         |    3 +-
>   koan/imagecreate.py |   65 ++++++++++++++++++++++++++++++++++----------------
>   koan/qcreate.py     |    2 +-
>   koan/vmwcreate.py   |    2 +-
>   koan/xencreate.py   |    2 +-
>   5 files changed, 49 insertions(+), 25 deletions(-)
>
>  diff --git a/koan/app.py b/koan/app.py
>  index fe39992..5dc1717 100755
>  --- a/koan/app.py
>  +++ b/koan/app.py
>  @@ -1059,7 +1059,8 @@ class Koan:
>                   arch          =  arch,
>                   no_gfx        =  self.no_gfx,   
>                   fullvirt      =  fullvirt,    
>  -                bridge        =  self.virt_bridge 
>  +                bridge        =  self.virt_bridge,
>  +                virt_type     =  self.virt_type
>           )
>   
>           print results
>  diff --git a/koan/imagecreate.py b/koan/imagecreate.py
>  index 5664917..7c400a8 100644
>  --- a/koan/imagecreate.py
>  +++ b/koan/imagecreate.py
>  @@ -25,11 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>   
>   import os, sys, time, stat
>   import shutil
>  -#import tempfile
>   import random
>   import exceptions
>   import errno
>  -#import re
>   import virtinst
>   from virtinst import ImageParser, Guest, CapabilitiesParser, VirtualNetworkInterface
>   import libvirt
>  @@ -81,17 +79,55 @@ def process_disk(image, boot, file, location, target):
>       boot.disks.append(drive)
>       #dev api
>       #boot.drives.append(drive)  
>  +    
>  +    
>  +def process_networks(domain, guest, profile_data, bridge):
>  +    # Create a bridge or default network for every requested nic. If there are more
>  +    # bridges then nics discard the last one.
>  +    domain.interface = int(profile_data["network_count"])
>  +    bridges = []
>  +    #use the provided bridge first
>  +    guest_bridge = bridge
>  +    if guest_bridge is None:
>  +        guest_bridge = profile_data["virt_bridge"]
>  +        
>  +    # Look for commas
>  +    if (guest_bridge is not None) and (len(guest_bridge.strip()) > 0):
>  +        if guest_bridge.find(",") == -1:
>  +            bridges.append(guest_bridge)
>  +        else:
>  +            bridges == guest_bridge.split(",")
>  +    
>  +    for cnt in range(0,domain.interface):
>  +        if cnt < len(bridges):
>  +            nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge
> = bridges[cnt])
>  +            #dev api
>  +            #nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge
> = bridge, conn=guest.conn)                
>  +        else: 
>  +            default_network = virtinst.util.default_network()
>  +            #dev api
>  +            #default_network = virtinst.util.default_network(guest.conn)
>  +            nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1])
>  +        guest.nics.append(nic)
>   
>   def start_install(name=None, ram=None, disks=None,
>                              uuid=None,  
>                              extra=None, 
>                              vcpus=None,  
>  -                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
> bridge=None):
>  -                   
>  -    print profile_data
>  +                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
> bridge=None, virt_type=None):                 
>  +                           
>       #FIXME how to do a non-default connection
>       #Can we drive off of virt-type?
>  -    connection = libvirt.open(virtinst.util.default_connection())
>  +    connection = None
>  +    
>  +    if (virt_type is None ) or (virt_type == "auto"):
>  +        connection = virtinst.util.default_connection()
>  +    elif virt_type.lower()[0:3] == "xen":
>  +        connection = "xen"
>  +    else:
>  +        connection = "qemu:///system"
>  +        
>  +    connection = libvirt.open(connection)
>       capabilities = virtinst.CapabilitiesParser.parse(connection.getCapabilities())   
>       image_arch = transform_arch(arch)       
>   
>  @@ -134,21 +170,8 @@ def start_install(name=None, ram=None, disks=None,
>       if uuid is not None:
>           guest.set_uuid(uuid)
>                      
>  -    #Create a single NIC. If no bridge is provided, use the default network 
>  -    domain.interface = 1 
>  -    if bridge == None:
>  -        default_network = virtinst.util.default_network()
>  -        #dev api
>  -        #default_network = virtinst.util.default_network(guest.conn)
>  -        nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1])
>  -        #dev api
>  -        #nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1], conn=guest.conn)        
>  -    else:
>  -        nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge =
> bridge)
>  -        #dev api
>  -        #nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge =
> bridge, conn=guest.conn)        
>  -        
>  -    guest.nics.append(nic)
>  +    process_networks(domain, guest, profile_data, bridge)                   
>  +    
>       guest.start_install()
>       
>       return "use virt-manager or reconnect with virsh console %s" % name 
>  diff --git a/koan/qcreate.py b/koan/qcreate.py
>  index e84ef69..bb3a9c2 100755
>  --- a/koan/qcreate.py
>  +++ b/koan/qcreate.py
>  @@ -55,7 +55,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
>                     uuid=None,  
>                     extra=None,
>                     vcpus=None, 
>  -                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None):
>  +                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None, virt_type=None):
>   
>       vtype = "qemu"
>       if virtinst.util.is_kvm_capable():
>  diff --git a/koan/vmwcreate.py b/koan/vmwcreate.py
>  index 1b8a4ff..f3c1581 100755
>  --- a/koan/vmwcreate.py
>  +++ b/koan/vmwcreate.py
>  @@ -121,7 +121,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
>                     uuid=None,  
>                     extra=None,
>                     vcpus=None, 
>  -                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None):
>  +                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None, , virt_type=None):
>   
>       if profile_data.has_key("file"):
>           raise koan.InfoException("vmware does not work with --image yet")
>  diff --git a/koan/xencreate.py b/koan/xencreate.py
>  index 807d744..21ce35b 100755
>  --- a/koan/xencreate.py
>  +++ b/koan/xencreate.py
>  @@ -62,7 +62,7 @@ def start_install(name=None, ram=None, disks=None,
>                              uuid=None,  
>                              extra=None, 
>                              vcpus=None,  
>  -                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
> bridge=None):
>  +                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
> bridge=None, virt_type=None):
>   
>       if profile_data.has_key("file"):
>           raise koan.InfoException("Xen does not work with --image yet")
>     
Applied the first, but was the second is not from the start of the 
changeset -- I don't have an imagecreate.py in Cobbler's devel branch.

--Michael

[PATCH] Adding a new installer which support virt-image based image deployment

[Bryan Kearney]

From: root <root(a)dhcp231-81.rdu.redhat.com&gt;

add virt-image creation to koan
---
 koan/app.py         |   16 +++--
 koan/imagecreate.py |  178 +++++++++++++++++++++++++++++++++++++++++++++++++++
 koan/qcreate.py     |    2 +-
 koan/vmwcreate.py   |    2 +-
 koan/xencreate.py   |    2 +-
 5 files changed, 192 insertions(+), 8 deletions(-)
 create mode 100644 koan/imagecreate.py

diff --git a/koan/app.py b/koan/app.py
index 13ce547..5dc1717 100755
--- a/koan/app.py
+++ b/koan/app.py
@@ -381,7 +381,7 @@ class Koan:
             if self.virt_type not in [ "qemu", "xenpv",
"xenfv", "xen", "vmware", "vmwarew",
"auto" ]:
                if self.virt_type == "xen":
                    self.virt_type = "xenpv"
-               raise InfoException, "--virttype should be qemu, xenpv, xenfv,
vmware, vmwarew, or auto"
+               raise InfoException, "--virt-type should be qemu, xenpv, xenfv,
vmware, vmwarew, or auto"
 
         # perform one of three key operations
         if self.is_virt:
@@ -501,8 +501,7 @@ class Koan:
                     raise InfoException("xmlfile based installations are not
supported")
 
                 elif profile_data.has_key("file"):
-                    # FIXME: this is actually an image based install, assume qemu/KVM
-                    print "- ISO based installation, always uses
--virt-type=qemu"
+                    print "- ISO or Image based installation, always uses
--virt-type=qemu"
                     self.virt_type = "qemu"
                     
                 else:
@@ -1060,7 +1059,8 @@ class Koan:
                 arch          =  arch,
                 no_gfx        =  self.no_gfx,   
                 fullvirt      =  fullvirt,    
-                bridge        =  self.virt_bridge 
+                bridge        =  self.virt_bridge,
+                virt_type     =  self.virt_type
         )
 
         print results
@@ -1072,6 +1072,7 @@ class Koan:
         try:
             import xencreate
             import qcreate
+            import imagecreate
         except:
             traceback.print_exc()
             raise InfoException("no virtualization support available, install
python-virtinst?")
@@ -1080,7 +1081,12 @@ class Koan:
 
     def virt_choose(self, pd):
         fullvirt = False
-        if self.virt_type in [ "xenpv", "xenfv" ]:
+        if (self.image is not None) and (pd["image_type"] ==
"virt-clone"):
+            fullvirt = True
+            uuid = None
+            import imagecreate
+            creator = imagecreate.start_install            
+        elif self.virt_type in [ "xenpv", "xenfv" ]:
             uuid    = self.get_uuid(self.calc_virt_uuid(pd))
             import xencreate
             creator = xencreate.start_install
diff --git a/koan/imagecreate.py b/koan/imagecreate.py
new file mode 100644
index 0000000..7c400a8
--- /dev/null
+++ b/koan/imagecreate.py
@@ -0,0 +1,178 @@
+"""
+Virtualization installation functions for image based deployment
+
+Copyright 2008 Red Hat, Inc.
+Bryan Kearney <bkearney(a)redhat.com&gt;
+
+Original version based on virt-image
+David Lutterkort <dlutter(a)redhat.com&gt;
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301  USA
+"""
+
+import os, sys, time, stat
+import shutil
+import random
+import exceptions
+import errno
+import virtinst
+from virtinst import ImageParser, Guest, CapabilitiesParser, VirtualNetworkInterface
+import libvirt
+
+import app as koan
+
+#FIXME this was copied
+def random_mac():
+    """
+    from xend/server/netif.py
+    Generate a random MAC address.
+    Uses OUI 00-16-3E, allocated to
+    Xensource, Inc.  Last 3 fields are random.
+    return: MAC address string
+    """
+    mac = [ 0x00, 0x16, 0x3e,
+        random.randint(0x00, 0x7f),
+        random.randint(0x00, 0xff),
+        random.randint(0x00, 0xff) ]
+    return ':'.join(map(lambda x: "%02x" % x, mac))
+
+
+def transform_arch(arch):
+    if arch == "i386":
+        return "i686"
+    else:
+        return arch
+        
+def copy_image(original_file, new_location):
+    shutil.copyfile(original_file, new_location)
+    return new_location
+    
+    
+def process_disk(image, boot, file, location, target):
+    image_location = copy_image(file, location)
+    # Create the disk
+    disk = ImageParser.Disk()
+    disk.format = "raw"
+    disk.file = image_location
+    disk.use = "user"
+    disk.id = image_location
+    image.storage[disk.id] = disk
+    
+    #Create the drive
+    drive = ImageParser.Drive()
+    drive.id = image_location
+    drive.target = target 
+    drive.disk = disk
+    boot.disks.append(drive)
+    #dev api
+    #boot.drives.append(drive)  
+    
+    
+def process_networks(domain, guest, profile_data, bridge):
+    # Create a bridge or default network for every requested nic. If there are more
+    # bridges then nics discard the last one.
+    domain.interface = int(profile_data["network_count"])
+    bridges = []
+    #use the provided bridge first
+    guest_bridge = bridge
+    if guest_bridge is None:
+        guest_bridge = profile_data["virt_bridge"]
+        
+    # Look for commas
+    if (guest_bridge is not None) and (len(guest_bridge.strip()) > 0):
+        if guest_bridge.find(",") == -1:
+            bridges.append(guest_bridge)
+        else:
+            bridges == guest_bridge.split(",")
+    
+    for cnt in range(0,domain.interface):
+        if cnt < len(bridges):
+            nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge =
bridges[cnt])
+            #dev api
+            #nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge
= bridge, conn=guest.conn)                
+        else: 
+            default_network = virtinst.util.default_network()
+            #dev api
+            #default_network = virtinst.util.default_network(guest.conn)
+            nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
network=default_network[1])
+        guest.nics.append(nic)
+
+def start_install(name=None, ram=None, disks=None,
+                           uuid=None,  
+                           extra=None, 
+                           vcpus=None,  
+                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
bridge=None, virt_type=None):                 
+                           
+    #FIXME how to do a non-default connection
+    #Can we drive off of virt-type?
+    connection = None
+    
+    if (virt_type is None ) or (virt_type == "auto"):
+        connection = virtinst.util.default_connection()
+    elif virt_type.lower()[0:3] == "xen":
+        connection = "xen"
+    else:
+        connection = "qemu:///system"
+        
+    connection = libvirt.open(connection)
+    capabilities = virtinst.CapabilitiesParser.parse(connection.getCapabilities())   
+    image_arch = transform_arch(arch)       
+
+    image = ImageParser.Image() 
+    #dev api
+    #image = ImageParser.Image(filename="") #FIXME, ImageParser should take in
None
+    image.name = name
+
+    domain = ImageParser.Domain()
+    domain.vcpu = vcpus
+    domain.memory = ram
+    image.domain = domain
+    
+    boot = ImageParser.Boot()
+    boot.type = "hvm" #FIXME HARDCODED
+    boot.loader = "hd" #FIXME HARDCODED
+    boot.arch = image_arch
+    domain.boots.append(boot)
+    
+    #FIXME Several issues. Single Disk, type is hardcoded
+    #And there is no way to provision with access to "file"
+    process_disk(image, boot, profile_data["file"], disks[0][0],
"hda")
+    
+    #FIXME boot_index??
+    installer = virtinst.ImageInstaller(boot_index = 0, image=image,
capabilities=capabilities)                               
+    guest = virtinst.FullVirtGuest(connection = connection, installer=installer,
arch=image_arch)
+
+    extra = extra.replace("&","&amp;")
+
+    guest.extraargs = extra
+    guest.set_name(name)
+    guest.set_memory(ram)
+    guest.set_vcpus(vcpus)
+
+    if not no_gfx:
+        guest.set_graphics("vnc")
+    else:
+        guest.set_graphics(False)
+
+    if uuid is not None:
+        guest.set_uuid(uuid)
+                   
+    process_networks(domain, guest, profile_data, bridge)                   
+    
+    guest.start_install()
+    
+    return "use virt-manager or reconnect with virsh console %s" % name 
+     
diff --git a/koan/qcreate.py b/koan/qcreate.py
index e84ef69..bb3a9c2 100755
--- a/koan/qcreate.py
+++ b/koan/qcreate.py
@@ -55,7 +55,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
                   uuid=None,  
                   extra=None,
                   vcpus=None, 
-                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
bridge=None):
+                  profile_data=None, arch=None, no_gfx=False, fullvirt=True, bridge=None,
virt_type=None):
 
     vtype = "qemu"
     if virtinst.util.is_kvm_capable():
diff --git a/koan/vmwcreate.py b/koan/vmwcreate.py
index 1b8a4ff..f3c1581 100755
--- a/koan/vmwcreate.py
+++ b/koan/vmwcreate.py
@@ -121,7 +121,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
                   uuid=None,  
                   extra=None,
                   vcpus=None, 
-                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
bridge=None):
+                  profile_data=None, arch=None, no_gfx=False, fullvirt=True, bridge=None,
, virt_type=None):
 
     if profile_data.has_key("file"):
         raise koan.InfoException("vmware does not work with --image yet")
diff --git a/koan/xencreate.py b/koan/xencreate.py
index 807d744..21ce35b 100755
--- a/koan/xencreate.py
+++ b/koan/xencreate.py
@@ -62,7 +62,7 @@ def start_install(name=None, ram=None, disks=None,
                            uuid=None,  
                            extra=None, 
                            vcpus=None,  
-                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
bridge=None):
+                           profile_data=None, arch=None, no_gfx=False, fullvirt=False,
bridge=None, virt_type=None):
 
     if profile_data.has_key("file"):
         raise koan.InfoException("Xen does not work with --image yet")
-- 
1.5.6.5

[PATCH] add virt-image creation to koan

[Bryan Kearney]

Michael DeHaan wrote:
>  Bryan Kearney wrote:
> > ---
> >  koan/app.py         |    3 +-
> >  koan/imagecreate.py |   65 ++++++++++++++++++++++++++++++++++----------------
> >  koan/qcreate.py     |    2 +-
> >  koan/vmwcreate.py   |    2 +-
> >  koan/xencreate.py   |    2 +-
> >  5 files changed, 49 insertions(+), 25 deletions(-)
> >
> > diff --git a/koan/app.py b/koan/app.py
> > index fe39992..5dc1717 100755
> > --- a/koan/app.py
> > +++ b/koan/app.py
> > @@ -1059,7 +1059,8 @@ class Koan:
> >                  arch          =  arch,
> >                  no_gfx        =  self.no_gfx,   
> >                  fullvirt      =  fullvirt,    
> > -                bridge        =  self.virt_bridge 
> > +                bridge        =  self.virt_bridge,
> > +                virt_type     =  self.virt_type
> >          )
> >  
> >          print results
> > diff --git a/koan/imagecreate.py b/koan/imagecreate.py
> > index 5664917..7c400a8 100644
> > --- a/koan/imagecreate.py
> > +++ b/koan/imagecreate.py
> > @@ -25,11 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> >  
> >  import os, sys, time, stat
> >  import shutil
> > -#import tempfile
> >  import random
> >  import exceptions
> >  import errno
> > -#import re
> >  import virtinst
> >  from virtinst import ImageParser, Guest, CapabilitiesParser,
> VirtualNetworkInterface
> >  import libvirt
> > @@ -81,17 +79,55 @@ def process_disk(image, boot, file, location, target):
> >      boot.disks.append(drive)
> >      #dev api
> >      #boot.drives.append(drive)  
> > +    
> > +    
> > +def process_networks(domain, guest, profile_data, bridge):
> > +    # Create a bridge or default network for every requested nic. If there are more
> > +    # bridges then nics discard the last one.
> > +    domain.interface = int(profile_data["network_count"])
> > +    bridges = []
> > +    #use the provided bridge first
> > +    guest_bridge = bridge
> > +    if guest_bridge is None:
> > +        guest_bridge = profile_data["virt_bridge"]
> > +        
> > +    # Look for commas
> > +    if (guest_bridge is not None) and (len(guest_bridge.strip()) > 0):
> > +        if guest_bridge.find(",") == -1:
> > +            bridges.append(guest_bridge)
> > +        else:
> > +            bridges == guest_bridge.split(",")
> > +    
> > +    for cnt in range(0,domain.interface):
> > +        if cnt < len(bridges):
> > +            nic = VirtualNetworkInterface(random_mac(), type="bridge",
> bridge = bridges[cnt])
> > +            #dev api
> > +            #nic = VirtualNetworkInterface(random_mac(), type="bridge",
> bridge = bridge, conn=guest.conn)                
> > +        else: 
> > +            default_network = virtinst.util.default_network()
> > +            #dev api
> > +            #default_network = virtinst.util.default_network(guest.conn)
> > +            nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1])
> > +        guest.nics.append(nic)
> >  
> >  def start_install(name=None, ram=None, disks=None,
> >                             uuid=None,  
> >                             extra=None, 
> >                             vcpus=None,  
> > -                           profile_data=None, arch=None, no_gfx=False,
> fullvirt=False, bridge=None):
> > -                   
> > -    print profile_data
> > +                           profile_data=None, arch=None, no_gfx=False,
> fullvirt=False, bridge=None, virt_type=None):                 
> > +                           
> >      #FIXME how to do a non-default connection
> >      #Can we drive off of virt-type?
> > -    connection = libvirt.open(virtinst.util.default_connection())
> > +    connection = None
> > +    
> > +    if (virt_type is None ) or (virt_type == "auto"):
> > +        connection = virtinst.util.default_connection()
> > +    elif virt_type.lower()[0:3] == "xen":
> > +        connection = "xen"
> > +    else:
> > +        connection = "qemu:///system"
> > +        
> > +    connection = libvirt.open(connection)
> >      capabilities = virtinst.CapabilitiesParser.parse(connection.getCapabilities())  
>
> >      image_arch = transform_arch(arch)       
> >  
> > @@ -134,21 +170,8 @@ def start_install(name=None, ram=None, disks=None,
> >      if uuid is not None:
> >          guest.set_uuid(uuid)
> >                     
> > -    #Create a single NIC. If no bridge is provided, use the default network 
> > -    domain.interface = 1 
> > -    if bridge == None:
> > -        default_network = virtinst.util.default_network()
> > -        #dev api
> > -        #default_network = virtinst.util.default_network(guest.conn)
> > -        nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1])
> > -        #dev api
> > -        #nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1], conn=guest.conn)        
> > -    else:
> > -        nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge
> = bridge)
> > -        #dev api
> > -        #nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge
> = bridge, conn=guest.conn)        
> > -        
> > -    guest.nics.append(nic)
> > +    process_networks(domain, guest, profile_data, bridge)                   
> > +    
> >      guest.start_install()
> >      
> >      return "use virt-manager or reconnect with virsh console %s" % name 
> > diff --git a/koan/qcreate.py b/koan/qcreate.py
> > index e84ef69..bb3a9c2 100755
> > --- a/koan/qcreate.py
> > +++ b/koan/qcreate.py
> > @@ -55,7 +55,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
> >                    uuid=None,  
> >                    extra=None,
> >                    vcpus=None, 
> > -                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None):
> > +                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None, virt_type=None):
> >  
> >      vtype = "qemu"
> >      if virtinst.util.is_kvm_capable():
> > diff --git a/koan/vmwcreate.py b/koan/vmwcreate.py
> > index 1b8a4ff..f3c1581 100755
> > --- a/koan/vmwcreate.py
> > +++ b/koan/vmwcreate.py
> > @@ -121,7 +121,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
> >                    uuid=None,  
> >                    extra=None,
> >                    vcpus=None, 
> > -                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None):
> > +                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None, , virt_type=None):
> >  
> >      if profile_data.has_key("file"):
> >          raise koan.InfoException("vmware does not work with --image yet")
> > diff --git a/koan/xencreate.py b/koan/xencreate.py
> > index 807d744..21ce35b 100755
> > --- a/koan/xencreate.py
> > +++ b/koan/xencreate.py
> > @@ -62,7 +62,7 @@ def start_install(name=None, ram=None, disks=None,
> >                             uuid=None,  
> >                             extra=None, 
> >                             vcpus=None,  
> > -                           profile_data=None, arch=None, no_gfx=False,
> fullvirt=False, bridge=None):
> > +                           profile_data=None, arch=None, no_gfx=False,
> fullvirt=False, bridge=None, virt_type=None):
> >  
> >      if profile_data.has_key("file"):
> >          raise koan.InfoException("Xen does not work with --image yet")
> >   
>  
>  Applied the first, but was the second is not from the start of the 
>  changeset -- I don't have an imagecreate.py in Cobbler's devel branch. 

Sorry... will resend.

-- bk

[PATCH] add virt-image creation to koan

[Michael DeHaan]

Bryan Kearney wrote:
>  Michael DeHaan wrote:
>    
> > Bryan Kearney wrote:
> >     
> >> ---
> >>  koan/app.py         |    3 +-
> >>  koan/imagecreate.py |   65 ++++++++++++++++++++++++++++++++++----------------
> >>  koan/qcreate.py     |    2 +-
> >>  koan/vmwcreate.py   |    2 +-
> >>  koan/xencreate.py   |    2 +-
> >>  5 files changed, 49 insertions(+), 25 deletions(-)
> >>
> >> diff --git a/koan/app.py b/koan/app.py
> >> index fe39992..5dc1717 100755
> >> --- a/koan/app.py
> >> +++ b/koan/app.py
> >> @@ -1059,7 +1059,8 @@ class Koan:
> >>                  arch          =  arch,
> >>                  no_gfx        =  self.no_gfx,   
> >>                  fullvirt      =  fullvirt,    
> >> -                bridge        =  self.virt_bridge 
> >> +                bridge        =  self.virt_bridge,
> >> +                virt_type     =  self.virt_type
> >>          )
> >>  
> >>          print results
> >> diff --git a/koan/imagecreate.py b/koan/imagecreate.py
> >> index 5664917..7c400a8 100644
> >> --- a/koan/imagecreate.py
> >> +++ b/koan/imagecreate.py
> >> @@ -25,11 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> >>  
> >>  import os, sys, time, stat
> >>  import shutil
> >> -#import tempfile
> >>  import random
> >>  import exceptions
> >>  import errno
> >> -#import re
> >>  import virtinst
> >>  from virtinst import ImageParser, Guest, CapabilitiesParser,
> VirtualNetworkInterface
> >>  import libvirt
> >> @@ -81,17 +79,55 @@ def process_disk(image, boot, file, location, target):
> >>      boot.disks.append(drive)
> >>      #dev api
> >>      #boot.drives.append(drive)  
> >> +    
> >> +    
> >> +def process_networks(domain, guest, profile_data, bridge):
> >> +    # Create a bridge or default network for every requested nic. If there are
> more
> >> +    # bridges then nics discard the last one.
> >> +    domain.interface = int(profile_data["network_count"])
> >> +    bridges = []
> >> +    #use the provided bridge first
> >> +    guest_bridge = bridge
> >> +    if guest_bridge is None:
> >> +        guest_bridge = profile_data["virt_bridge"]
> >> +        
> >> +    # Look for commas
> >> +    if (guest_bridge is not None) and (len(guest_bridge.strip()) > 0):
> >> +        if guest_bridge.find(",") == -1:
> >> +            bridges.append(guest_bridge)
> >> +        else:
> >> +            bridges == guest_bridge.split(",")
> >> +    
> >> +    for cnt in range(0,domain.interface):
> >> +        if cnt < len(bridges):
> >> +            nic = VirtualNetworkInterface(random_mac(), type="bridge",
> bridge = bridges[cnt])
> >> +            #dev api
> >> +            #nic = VirtualNetworkInterface(random_mac(),
> type="bridge", bridge = bridge, conn=guest.conn)                
> >> +        else: 
> >> +            default_network = virtinst.util.default_network()
> >> +            #dev api
> >> +            #default_network = virtinst.util.default_network(guest.conn)
> >> +            nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1])
> >> +        guest.nics.append(nic)
> >>  
> >>  def start_install(name=None, ram=None, disks=None,
> >>                             uuid=None,  
> >>                             extra=None, 
> >>                             vcpus=None,  
> >> -                           profile_data=None, arch=None, no_gfx=False,
> fullvirt=False, bridge=None):
> >> -                   
> >> -    print profile_data
> >> +                           profile_data=None, arch=None, no_gfx=False,
> fullvirt=False, bridge=None, virt_type=None):                 
> >> +                           
> >>      #FIXME how to do a non-default connection
> >>      #Can we drive off of virt-type?
> >> -    connection = libvirt.open(virtinst.util.default_connection())
> >> +    connection = None
> >> +    
> >> +    if (virt_type is None ) or (virt_type == "auto"):
> >> +        connection = virtinst.util.default_connection()
> >> +    elif virt_type.lower()[0:3] == "xen":
> >> +        connection = "xen"
> >> +    else:
> >> +        connection = "qemu:///system"
> >> +        
> >> +    connection = libvirt.open(connection)
> >>      capabilities =
> virtinst.CapabilitiesParser.parse(connection.getCapabilities())   
> >>      image_arch = transform_arch(arch)       
> >>  
> >> @@ -134,21 +170,8 @@ def start_install(name=None, ram=None, disks=None,
> >>      if uuid is not None:
> >>          guest.set_uuid(uuid)
> >>                     
> >> -    #Create a single NIC. If no bridge is provided, use the default network 
> >> -    domain.interface = 1 
> >> -    if bridge == None:
> >> -        default_network = virtinst.util.default_network()
> >> -        #dev api
> >> -        #default_network = virtinst.util.default_network(guest.conn)
> >> -        nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1])
> >> -        #dev api
> >> -        #nic = VirtualNetworkInterface(random_mac(), type=default_network[0],
> network=default_network[1], conn=guest.conn)        
> >> -    else:
> >> -        nic = VirtualNetworkInterface(random_mac(), type="bridge",
> bridge = bridge)
> >> -        #dev api
> >> -        #nic = VirtualNetworkInterface(random_mac(), type="bridge",
> bridge = bridge, conn=guest.conn)        
> >> -        
> >> -    guest.nics.append(nic)
> >> +    process_networks(domain, guest, profile_data, bridge)                   
> >> +    
> >>      guest.start_install()
> >>      
> >>      return "use virt-manager or reconnect with virsh console %s" %
> name 
> >> diff --git a/koan/qcreate.py b/koan/qcreate.py
> >> index e84ef69..bb3a9c2 100755
> >> --- a/koan/qcreate.py
> >> +++ b/koan/qcreate.py
> >> @@ -55,7 +55,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
> >>                    uuid=None,  
> >>                    extra=None,
> >>                    vcpus=None, 
> >> -                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None):
> >> +                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None, virt_type=None):
> >>  
> >>      vtype = "qemu"
> >>      if virtinst.util.is_kvm_capable():
> >> diff --git a/koan/vmwcreate.py b/koan/vmwcreate.py
> >> index 1b8a4ff..f3c1581 100755
> >> --- a/koan/vmwcreate.py
> >> +++ b/koan/vmwcreate.py
> >> @@ -121,7 +121,7 @@ def start_install(name=None, ram=None, disks=None, mac=None,
> >>                    uuid=None,  
> >>                    extra=None,
> >>                    vcpus=None, 
> >> -                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None):
> >> +                  profile_data=None, arch=None, no_gfx=False, fullvirt=True,
> bridge=None, , virt_type=None):
> >>  
> >>      if profile_data.has_key("file"):
> >>          raise koan.InfoException("vmware does not work with --image
> yet")
> >> diff --git a/koan/xencreate.py b/koan/xencreate.py
> >> index 807d744..21ce35b 100755
> >> --- a/koan/xencreate.py
> >> +++ b/koan/xencreate.py
> >> @@ -62,7 +62,7 @@ def start_install(name=None, ram=None, disks=None,
> >>                             uuid=None,  
> >>                             extra=None, 
> >>                             vcpus=None,  
> >> -                           profile_data=None, arch=None, no_gfx=False,
> fullvirt=False, bridge=None):
> >> +                           profile_data=None, arch=None, no_gfx=False,
> fullvirt=False, bridge=None, virt_type=None):
> >>  
> >>      if profile_data.has_key("file"):
> >>          raise koan.InfoException("Xen does not work with --image
> yet")
> >>   
> >>       
> > Applied the first, but was the second is not from the start of the 
> > changeset -- I don't have an imagecreate.py in Cobbler's devel branch.
> >     
>
>
>  Sorry... will resend.
>
>  -- bk
>  _______________________________________________
>  cobbler mailing list
>  cobbler(a)lists.fedorahosted.org
>  https://fedorahosted.org/mailman/listinfo/cobbler
>     
Thanks, very cool!

Could you please start a thread explaining how users would use this end 
to tend to repeatedly clone virt images (showing the other tools 
involved, if any?)

I (mostly) know what this does for the most part, though I think it 
would be good to get a discussion going around it.

Once we have a few examples, we should also get this up on the Wiki on 
the AllAboutImages page.

--Michael