More work on the model

1 files changed, 16 insertions, 13 deletions

diff --git a/cloudmasterd/lib/cloudmasterd.rb b/cloudmasterd/lib/cloudmasterd.rb
index ac091ad..90e8d8a 100644
--- a/cloudmasterd/lib/cloudmasterd.rb
+++ b/cloudmasterd/lib/cloudmasterd.rb
@@ -104,8 +104,7 @@ module Cloudmasterd::Controllers
       return cobblerd.profile(cobbler_system["profile"])
     end
 
-    # Find the best host on which to create a VM that requires
-    # the given "disk_size" and "ram"
+    # Find the best host on which to create a VM
     def _get_best_host(disk_size, ram)
       return `func-find-resources -m #{ram}`.chomp()
     end
@@ -115,13 +114,11 @@ module Cloudmasterd::Controllers
     def _koan(host, fqdn, repo)
       # Run the koan process
       func_cmd = "func \"#{host}\" call virt install #{repo} #{fqdn} True #{fqdn} /images"
-      `#{func_cmd}`
-      raise "Func installation failed for host #{host} against repo #{fqdn}" unless $?.success?
+      puts `#{func_cmd}`
 
       # Make the new host autostart
-      func_cmd = "func \"#{host}\" call command run \"ln -s /etc/xen/#{fqdn} /etc/xen/auto/\""
-      `#{func_cmd}`
-      raise "Symbolic link creation failed for host #{host} against repo #{fqdn}" unless $?.success?
+      func_cmd = "func \"#{host}\" call command run \"ln -s /etc/xen/#{fqdn.split('.')[0]} /etc/xen/auto/\""
+      puts `#{func_cmd}`
     end
 
     # POST /koan
@@ -141,7 +138,10 @@ module Cloudmasterd::Controllers
 
   class Cloud < REST 'cloud'
     def list
-      @machines = Machine.find :all
+      @machines = {}
+      Machine.find(:all, :select => "distinct user_email").map{|x| x.user_email}.each do |email|
+        @machines[email] = Machine.find(:all, :conditions => "user_email = '#{email}'")
+      end
       render :cloud
     end
   end
@@ -170,13 +170,16 @@ module Cloudmasterd::Views
     end
 
     def cloud
-      @machines.each do |m|
+      @machines.keys.each do |email|
         div do
-          h1 m.user_email
-          p m.machine
-          p m.destination
+          h1 email
+          ul do
+            @machines[email].each do |machine|
+              li "#{machine.destination}: #{machine.machine}" 
+            end
+          end
         end
-      end     
+      end
     end
  
     def _koan