Fixes for virt overrides on system objects.

5 files changed, 24 insertions, 26 deletions

diff --git a/cobbler/item_distro.py b/cobbler/item_distro.py
index 1e392a5..1a4c296 100644
--- a/cobbler/item_distro.py
+++ b/cobbler/item_distro.py
@@ -180,12 +180,12 @@ class Distro(item.Item):
         kstr = utils.find_kernel(self.kernel)
         istr = utils.find_initrd(self.initrd)
         buf =       _("distro          : %s\n") % self.name
-        buf = buf + _("kernel          : %s\n") % kstr
+        buf = buf + _("breed           : %s\n") % self.breed
+        buf = buf + _("architecture    : %s\n") % self.arch
         buf = buf + _("initrd          : %s\n") % istr
+        buf = buf + _("kernel          : %s\n") % kstr
         buf = buf + _("kernel options  : %s\n") % self.kernel_options
-        buf = buf + _("architecture    : %s\n") % self.arch
         buf = buf + _("ks metadata     : %s\n") % self.ks_meta
-        buf = buf + _("breed           : %s\n") % self.breed
         buf = buf + _("owners          : %s\n") % self.owners
         return buf
 
diff --git a/cobbler/item_profile.py b/cobbler/item_profile.py
index b472b48..019f01a 100644
--- a/cobbler/item_profile.py
+++ b/cobbler/item_profile.py
@@ -240,19 +240,19 @@ class Profile(item.Item):
             buf = buf + _("parent          : %s\n") % self.parent
         else:
             buf = buf + _("distro          : %s\n") % self.distro
-        buf = buf + _("kickstart       : %s\n") % self.kickstart
+        buf = buf + _("dhcp tag        : %s\n") % self.dhcp_tag
         buf = buf + _("kernel options  : %s\n") % self.kernel_options
+        buf = buf + _("kickstart       : %s\n") % self.kickstart
         buf = buf + _("ks metadata     : %s\n") % self.ks_meta
+        buf = buf + _("owners          : %s\n") % self.owners
+        buf = buf + _("repos           : %s\n") % self.repos
+        buf = buf + _("server          : %s\n") % self.server
+        buf = buf + _("virt bridge     : %s\n") % self.virt_bridge
+        buf = buf + _("virt cpus       : %s\n") % self.virt_cpus
         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
         buf = buf + _("virt type       : %s\n") % self.virt_type
-        buf = buf + _("virt path       : %s\n") % self.virt_path
-        buf = buf + _("virt bridge     : %s\n") % self.virt_bridge
-        buf = buf + _("virt cpus       : %s\n") % self.virt_cpus
-        buf = buf + _("repos           : %s\n") % self.repos
-        buf = buf + _("dhcp tag        : %s\n") % self.dhcp_tag
-        buf = buf + _("server          : %s\n") % self.server
-        buf = buf + _("owners          : %s\n") % self.owners
         return buf
 
   
diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py
index ba32a07..3b9b839 100644
--- a/cobbler/item_repo.py
+++ b/cobbler/item_repo.py
@@ -189,14 +189,14 @@ class Repo(item.Item):
 
     def printable(self):
         buf =       _("repo             : %s\n") % self.name
-        buf = buf + _("owners           : %s\n") % self.owners
+        buf = buf + _("arch             : %s\n") % self.arch
+        buf = buf + _("createrepo_flags : %s\n") % self.createrepo_flags
+        buf = buf + _("keep updated     : %s\n") % self.keep_updated
         buf = buf + _("mirror           : %s\n") % self.mirror
         buf = buf + _("mirror locally   : %s\n") % self.mirror_locally
-        buf = buf + _("keep updated     : %s\n") % self.keep_updated
+        buf = buf + _("owners           : %s\n") % self.owners
         buf = buf + _("priority         : %s\n") % self.priority
         buf = buf + _("rpm list         : %s\n") % self.rpm_list
-        buf = buf + _("createrepo_flags : %s\n") % self.createrepo_flags
-        buf = buf + _("arch             : %s\n") % self.arch
         buf = buf + _("yum options      : %s\n") % self.yumopts
         return buf
 
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index a97cdf6..6effc22 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -300,7 +300,7 @@ class System(item.Item):
         return utils.set_virt_ram(self,num)
 
     def set_virt_type(self,vtype):
-        return utils.set_virt_Type(self,vtype)
+        return utils.set_virt_type(self,vtype)
 
     def set_virt_path(self,path):
         return utils.set_virt_path(self,path)
@@ -384,20 +384,19 @@ class System(item.Item):
         buf =       _("system           : %s\n") % self.name
         buf = buf + _("profile          : %s\n") % self.profile
         buf = buf + _("kernel options   : %s\n") % self.kernel_options
+        buf = buf + _("kickstart        : %s\n") % self.kickstart
         buf = buf + _("ks metadata      : %s\n") % self.ks_meta
         
         buf = buf + _("netboot enabled? : %s\n") % self.netboot_enabled 
-        buf = buf + _("kickstart        : %s\n") % self.kickstart
+        buf = buf + _("owners           : %s\n") % self.owners
+        buf = buf + _("server           : %s\n") % self.server
 
-        buf = buf + _("virt file size  : %s\n") % self.virt_file_size
-        buf = buf + _("virt ram        : %s\n") % self.virt_ram
-        buf = buf + _("virt type       : %s\n") % self.virt_type
-        buf = buf + _("virt path       : %s\n") % self.virt_path
-        buf = buf + _("virt bridge     : %s\n") % self.virt_bridge
-        buf = buf + _("virt cpus       : %s\n") % self.virt_cpus
+        buf = buf + _("virt cpus        : %s\n") % self.virt_cpus
+        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
+        buf = buf + _("virt type        : %s\n") % self.virt_type
 
-        buf = buf + _("server           : %s\n") % self.server
-        buf = buf + _("owners           : %s\n") % self.owners
 
         counter = 0
         for (name,x) in self.interfaces.iteritems():
diff --git a/cobbler/modules/cli_system.py b/cobbler/modules/cli_system.py
index 6e301d1..d8f8edf 100644
--- a/cobbler/modules/cli_system.py
+++ b/cobbler/modules/cli_system.py
@@ -96,7 +96,6 @@ class SystemFunction(commands.CobblerFunction):
 
         if self.options.virt_file_size:  obj.set_virt_file_size(self.options.virt_file_size)
         if self.options.virt_ram:        obj.set_virt_ram(self.options.virt_ram)
-        if self.options.virt_bridge:     obj.set_virt_bridge(self.options.virt_bridge)
         if self.options.virt_type:       obj.set_virt_type(self.options.virt_type)
         if self.options.virt_cpus:       obj.set_virt_cpus(self.options.virt_cpus)
         if self.options.virt_path:       obj.set_virt_path(self.options.virt_path)