Merge pull request #113 from camptocamp/development

Development

Author: rwaffen

lib/puppet/provider/onevm/cli.rb

@@ -14,23 +14,10 @@
 
   mk_resource_methods
 
-  # Create a VM with onevm by passing in a temporary template.
+  # Create a VM with onetemplate instantiate.
   def create
-      # create template content from template
-      template_output = onetemplate('show', resource[:template])
-      template_content = `#{template_output} | grep -A 100000 'TEMPLATE CONTENT' | grep -v 'TEMPLATE CONTENT'`
-      file = Tempfile.new("onevm-#{resource[:name]}")
-      template = ERB.new <<-EOF
-NAME = <%= resource[:name] %>
-<%= template_content %>
-EOF
-      
-      tempfile = template.result(binding)
-      file.write(tempfile)
-      file.close
-      self.debug "Creating onevm with template content: #{tempfile}"
-      onevm('create', file.path)
-      @property_hash[:ensure] = :present
+    onetemplate('instantiate', resource[:template], '--name', resource[:name])
+    @property_hash[:ensure] = :present
   end
 
   # Destroy a VM using onevm delete

spec/acceptance/onevm_spec.rb

@@ -1,33 +1,48 @@
 require 'spec_helper_acceptance'
 
 describe 'onevm type' do
+  before :all do
+    pp = <<-EOS
+    class { 'one':
+      oned => true,
+    }
+    onetemplate { 'test-vm':
+      # Capacity
+      cpu    => 1,
+      memory => 128,
+
+      # OS
+      os_kernel     => '/vmlinuz',
+      os_initrd     => '/initrd.img',
+      os_root       => 'sda1',
+      os_kernel_cmd => 'ro xencons=tty console=tty1',
+
+      # Features
+      acpi        => true,
+      pae         => true,
+
+      # Disks
+      disks  => [ 'Data', 'Experiments', ],
+
+      # Network
+      nics   => [ 'Blue', 'Red', ],
+
+      # I/O Devices
+      graphics_type   => 'vnc',
+      graphics_listen => '0.0.0.0',
+      graphics_port   => 5,
+    }
+    EOS
+    apply_manifest(pp, :catch_failures => true)
+    apply_manifest(pp, :catch_changes => true)
+  end
 
   describe 'when creating vm' do
     it 'should idempotently run' do
       pending 'Need fix'
       pp = <<-EOS
-        class { 'one':
-          oned => true,
-        } ->
-        oneimage { 'new_image':
-          source => '/foo/bar.img',
-          size   => '50',
-        }
-        ->
-        onevnet { 'new_vnet':
-          bridge          => 'vbr0',
-          network_address => '192.168.0.0',
-        } 
-        ->
-        onetemplate { 'new_template':
-          nics   => 'bar',
-          memory => 512,
-          cpu    => 1,
-	  disks  => 'new_image',
-        }
-        ->
         onevm { 'new_vm':
-          template => 'new_template',
+          template => 'test-vm',
         }
       EOS