knife-xapi 0.4.6 → 0.5.0.rc3

data/lib/chef/knife/xapi_base.rb

@@ -507,6 +507,38 @@ class Chef::Knife
       task_ref = get_task_ref(task)
     end
 
+   
+    def get_host_ref(hostname)
+      xapi.host.get_all.each do |ref|
+        name = xapi.host.get_name_label ref
+        return ref if hostname == name
+      end
+      nil
+    end
+
+    def start(vm_ref, host=nil)
+      if host
+        host_ref = get_host_ref(host)
+        unless host_ref
+          ui.msg "Host not found #{host}"
+          exit 1
+        end
+        ui.msg( "Starting #{vm_ref} on #{host}" )
+        task = xapi.Async.VM.start_on(vm_ref, host_ref, false, true)
+      else
+        ui.msg( "Starting #{vm_ref} " )
+        task = xapi.Async.VM.start(vm_ref, false, true)
+      end
+      wait_on_task(task)
+      ui.msg( "#{ h.color "OK!", :green}" )
+    end
+
+    def stop(vm_ref)
+      ui.msg( "Stopping #{vm_ref}" )
+      task = xapi.Async.VM.clean_shutdown(vm_ref)
+      wait_on_task(task)
+      ui.msg( "#{ h.color "OK!", :green}" )
+    end
 
   end
 end

data/lib/chef/knife/xapi_guest_create.rb

@@ -37,7 +37,7 @@ class Chef
         :xapi_disk_size => "8g",
         :xapi_cpus => "1",
         :xapi_mem => "1g",
-        :bootstrap_template => "ubuntu10.04-gems",
+        :bootstrap_template => "chef-full",
         :template_file => false,
         :run_list => [],
         :json_attributes => {}
@@ -320,9 +320,7 @@ class Chef
           provisioned = xapi.VM.provision(vm_ref)
 
           ui.msg "Starting new Guest #{h.color( provisioned, :cyan)} "
-          task = xapi.Async.VM.start(vm_ref, false, true)
-          wait_on_task(task)
-          ui.msg( "#{ h.color "OK!", :green}" )
+          start(vm_ref)
 
           exit 0 unless locate_config_value(:run_list)
         rescue Exception => e
@@ -333,8 +331,10 @@ class Chef
           fail(vm_ref)
         end
 
-        if locate_config_value(:run_list).empty? or ! locate_config_value(:template_file)
-          exit 0
+        if locate_config_value(:run_list).empty?
+          unless ( locate_config_value(:template_file) or locate_config_value(:bootstrap_template) )
+            exit 0
+          end
         end
 
         guest_addr = wait_for_guest_ip(vm_ref)

data/lib/chef/knife/xapi_guest_start.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Jesse Nelson <spheromak@gmail.com> 
+# Author:: Seung-jin/Sam Kim (<seungjin.kim@me.comm>)
+#
+# Copyright:: Copyright (c) 2012 Jesse Nelson
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'chef/knife/xapi_base'
+require 'chef/knife/xapi_vmselect'
+
+class Chef
+  class Knife
+    class XapiGuestStart < Knife
+      include Chef::Knife::XapiBase
+
+      banner "knife xapi guest start"
+    
+      include Chef::Knife::XapiVmSelect
+
+      def run
+        vm = select_vm(@name_args[0])
+
+        if vm.is_a? Array
+          vm.each { |vm| start(vm) }
+        else
+          start(vm)
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife/xapi_guest_stop.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Jesse Nelson <spheromak@gmail.com> 
+# Author:: Seung-jin/Sam Kim (<seungjin.kim@me.comm>)
+#
+# Copyright:: Copyright (c) 2012 Jesse Nelson
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'chef/knife/xapi_base'
+require 'chef/knife/xapi_vmselect'
+
+class Chef
+  class Knife
+    class XapiGuestStop < Knife
+      include Chef::Knife::XapiBase
+
+      banner "knife xapi guest stop"
+
+      include Chef::Knife::XapiVmSelect
+
+      def run
+        vm = select_vm(@name_args[0])
+
+        if vm.is_a? Array
+          vm.each { |vm| stop(vm) }
+        else
+          stop(vm)
+        end
+        
+
+      end
+
+    end
+  end
+end

data/lib/chef/knife/xapi_vmselect.rb

@@ -0,0 +1,46 @@
+
+class Chef::Knife
+  module XapiVmSelect
+
+    def self.included(includer)
+      includer.class_eval do
+      option :uuid,
+        :short => "-U",
+        :long => "--uuid",
+        :description => "Treat the label as a UUID not a name label"
+      end
+    end
+
+    def select_vm(name)
+      if name.nil?
+        ui.msg "Must Provide VM Name"
+        ui.msg "Usage: " + banner
+        exit 1
+      end
+
+      vms = []
+      if config[:uuid]
+        vms << xapi.VM.get_by_uuid(name).flatten
+      else
+        vms << xapi.VM.get_by_name_label(name).flatten
+      end
+      vms.flatten!
+
+      if vms.empty?
+        ui.msg ui.color "could not find vm named #{name}", :red
+        exit 1
+      end
+
+      if vms.length > 1
+        vm = user_select(vms)
+        if vm == :all 
+          return vms
+        end
+      else
+        vm = vms.first
+      end
+      vm
+    end
+
+  end
+end

data/lib/knife-xapi/version.rb

@@ -1,3 +1,3 @@
 module KnifeXenserver
-  VERSION = "0.4.6"
+  VERSION = "0.5.0.rc3"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-xapi
 version: !ruby/object:Gem::Version
-  version: 0.4.6
-  prerelease: 
+  version: 0.5.0.rc3
+  prerelease: 6
 platform: ruby
 authors:
 - Jesse Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -71,11 +71,14 @@ files:
 - lib/chef/knife/xapi_guest_create.rb
 - lib/chef/knife/xapi_guest_delete.rb
 - lib/chef/knife/xapi_guest_list.rb
+- lib/chef/knife/xapi_guest_start.rb
+- lib/chef/knife/xapi_guest_stop.rb
 - lib/chef/knife/xapi_vdi_attach.rb
 - lib/chef/knife/xapi_vdi_create.rb
 - lib/chef/knife/xapi_vdi_delete.rb
 - lib/chef/knife/xapi_vdi_detach.rb
 - lib/chef/knife/xapi_vdi_list.rb
+- lib/chef/knife/xapi_vmselect.rb
 - lib/knife-xapi/version.rb
 - lib/xenapi/README
 - lib/xenapi/xen_api.rb
@@ -100,12 +103,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Xen API Support for Chef's Knife Command