[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-113-gbb16481

Michael DeHaan mdehaan at redhat.com
Thu Aug 2 20:46:09 UTC 2007


Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  bb1648163b619f862f858ed29bafeca6269f4a6f (commit)
       via  c2f9fd87ad2be4b4c9e2f2294b1affc9d7b39af3 (commit)
       via  00bdb8cc0e980f573afb41a35f212f07ac09d7ac (commit)
      from  ca594653635f68e1fb804dd8d3500ae75e2a1672 (commit)

- Log -----------------------------------------------------------------
commit bb1648163b619f862f858ed29bafeca6269f4a6f
Merge: c2f9fd8... ca59465...
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Thu Aug 2 16:42:33 2007 -0400

    Merge branch 'master' of git+ssh://g-mdehaan@et.redhat.com/git/virt-factory

commit c2f9fd87ad2be4b4c9e2f2294b1affc9d7b39af3
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Thu Aug 2 16:32:34 2007 -0400

    Add virt_type field to WUI display

commit 00bdb8cc0e980f573afb41a35f212f07ac09d7ac
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Thu Aug 2 16:30:44 2007 -0400

    Install virt-type in profiles db field
-----------------------------------------------------------------------

Diffstat:
 service/scripts/vf_import            |   10 ++++++++++
 wui/src/app/views/profile/edit.rhtml |    4 ++++
 wui/src/app/views/profile/list.rhtml |    2 ++
 wui/src/app/views/profile/view.rhtml |    4 ++++
 4 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/service/scripts/vf_import b/service/scripts/vf_import
index 444a3ed..33d92e8 100755
--- a/service/scripts/vf_import
+++ b/service/scripts/vf_import
@@ -225,6 +225,16 @@ class VirtFactoryImporter:
                profile_dict["name"] = profile_dict["name"] + "::" + distribution_name
                profile_obj = profile.Profile()
 
+               # override the virt type based on the distro
+               if distribution_name.find("xen") != -1:
+                   profile_dict["virt_type"] = "xenpv"
+               else:
+                   # FIXME: if we support more than just kvm/qemu we will 
+                   # want to do this slightly differently.
+                   # qemu here doesn't mean qemu explicitly just things that
+                   # take qemu disk images.
+                   profile_dict["virt_type"] = "qemu"
+
                # create or modify existing
                
                self.logger.info("constructing profile record: %s" % profile_dict)
diff --git a/wui/src/app/views/profile/edit.rhtml b/wui/src/app/views/profile/edit.rhtml
index 27279b1..b2ae30a 100755
--- a/wui/src/app/views/profile/edit.rhtml
+++ b/wui/src/app/views/profile/edit.rhtml
@@ -25,6 +25,10 @@
              </TD>
          </TR>
          <TR>
+            <TD><%= _("Virtual Type") %></TD>
+            <TD><%= f.text_field :virt_type %></TD>
+         </TR>
+         <TR>
             <TD><%= _("Virtual Storage Size (GB)") %></TD>
             <TD><%= f.text_field :virt_storage_size %></TD>
          </TR>
diff --git a/wui/src/app/views/profile/list.rhtml b/wui/src/app/views/profile/list.rhtml
index 980ac52..fe37720 100755
--- a/wui/src/app/views/profile/list.rhtml
+++ b/wui/src/app/views/profile/list.rhtml
@@ -10,6 +10,7 @@
             <th><%= _("Name") %></th>
             <th><%= _("Version") %></th>
             <th><%= _("Distribution") %></th>
+            <th><%= _("Virt Type") %></th>
             <th><%= _("Virt Storage (GB)") %></th>
             <th><%= _("Virt Memory (MB)") %></th>
             <th><%= _("Targets") %></th>
@@ -29,6 +30,7 @@
              <TD> <%= link_to item.name, :controller => "profile", :action=> "edit", :id=> item.id %></TD>
              <TD> <%= item.version %> </TD>
              <TD> <%= item.distribution.name %> </TD>
+             <TD> <%= item.virt_type %> </TD>
              <TD> <%= item.virt_storage_size %> </TD>
              <TD> <%= item.virt_ram %> </TD>
              <TD> <%= VALID_TARGETS[item.valid_targets] %> </TD>
diff --git a/wui/src/app/views/profile/view.rhtml b/wui/src/app/views/profile/view.rhtml
index ce23e17..4fa458a 100755
--- a/wui/src/app/views/profile/view.rhtml
+++ b/wui/src/app/views/profile/view.rhtml
@@ -17,6 +17,10 @@
             <TD><%= @item.distribution.name %></TD>
          </TR>
          <TR>
+            <TD><%= _("Virt Type") %></TD>
+            <TD><%= @item.virt_type %></TD>
+         </TR>
+         <TR>
             <TD><%= _("Virtual Storage Size (GB)") %></TD>
             <TD><%= @item.virt_storage_size %></TD>
          </TR>

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  ca594653635f68e1fb804dd8d3500ae75e2a1672 \
  bb1648163b619f862f858ed29bafeca6269f4a6f




More information about the Et-mgmt-commits-list mailing list