knife-xenserver 1.2.3 → 1.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0a21012f437a6b7241b41a04ae171ce86c27ed40
+  data.tar.gz: 625142e1c88af7d2268efd3dd823cdaa7e83969a
+SHA512:
+  metadata.gz: 97caa51eb4b6bbf79f02f25cf3576b5ccd30a416c2d795954e586c5007987dd73c92e06a3f92c902f1a7d482d43e2ac94e5378230f1d1c48d929805a031484f5
+  data.tar.gz: b68b1bddf3c70ca6862af78b388ac6acc58f6ca16c9a2093fbd626a1dd5a3ea7f826ce524a76b6245855c8b2a75a4fe41f010beda448b02db6eb910c687ca756

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 1.3.1 - Thy 06 Jun 2013 
+
+* Fixing some --extra-vdis parsing issues
+* Fix nasty bug while trying to roll back destroying the created VM
+
+# 1.3.0 - Thy 06 Jun 2013 
+
+* New **sr list** command to list storage repositories.
+* Experimental **sr create** command to create a Storage Repository.
+* The **vm create** command now supports --extra-vdis option to
+  create additional VDIs and attach them to the VM.
+* New **host list** command: currently lists UUID only.
+
+
 # 1.2.3 - Fri 07 Dec 2012
 
 * Drop alchemist gem, fixing some compat issues with some ruby 1.9

data/lib/chef/knife/xenserver_host_list.rb

@@ -0,0 +1,41 @@
+#
+# Author:: Sergio Rubio (<rubiojr@frameos.org>)
+# 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/xenserver_base'
+
+class Chef
+  class Knife
+    class XenserverHostList < Knife
+
+      include Knife::XenserverBase
+
+      banner "knife xenserver host list (options)"
+      
+      def run
+        hosts = connection.hosts
+        table = table do |t|
+          t.headings = %w{NAME UUID}
+          hosts.each do |host|
+            t << [host.name, host.uuid]
+          end
+        end
+        puts table if !hosts.empty?
+      end
+
+    end
+  end
+end

data/lib/chef/knife/xenserver_sr_create.rb

@@ -0,0 +1,99 @@
+#
+# Author:: Sergio Rubio (<rubiojr@frameos.org>)
+# 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/xenserver_base'
+require 'resolv'
+
+class Chef
+  class Knife
+    class XenserverSrCreate < Knife
+
+      include Knife::XenserverBase
+
+      banner "knife xenserver sr create (options)"
+
+      option :sr_name,
+        :long => "--sr-name NAME",
+        :description => "The Storage Repository name"
+      
+      option :sr_type,
+        :long => "--sr-type TYPE",
+        :description => "The Storage Repository type (ext|lvm)"
+      
+      option :sr_device,
+        :long => "--sr-device PATH",
+        :description => "Block device path in host"
+      
+      option :sr_host,
+        :long => "--sr-host UUID",
+        :description => "Host where the Storage Repository will be created"
+      
+      def run
+        sr_name = config[:sr_name]
+        if not sr_name
+          ui.error("Invalid Storage Repository name (--sr-name)")
+          exit 1
+        end
+        
+        sr_type = config[:sr_type]
+        if not sr_type
+          ui.error("Invalid Storage Repository type (--sr-type)")
+          exit 1
+        end
+        
+        sr_device = config[:sr_device]
+        if not sr_device
+          ui.error("Invalid Storage Repository device (--sr-device)")
+          exit 1
+        end
+        
+        hosts = connection.hosts
+        sr_host = config[:sr_host]
+        if sr_host.nil? and hosts.size > 1
+          if not sr_host
+            ui.error("More than one host found in the pool.")
+            ui.error("--sr-host parameter is mandatory")
+            exit 1
+          end
+        end
+
+        if sr_host
+          # Find the host in the pool
+          host = connection.hosts.find { |h| h.uuid == sr_host }
+        else
+          # We only have one hosts
+          host = hosts.first
+        end
+
+        # The given host was not found in the pool
+        if host.nil?
+          ui.error "Host #{sr_host} not found in the pool"
+          exit 1
+        end
+        
+        dconfig = { :device => sr_device }
+        puts "Creating SR #{sr_name.yellow} in host #{host.name} (#{sr_type}, #{sr_device})..."
+        vm = connection.storage_repositories.create :name => sr_name,
+                                                    :host => host,
+                                                    :device_config => dconfig,
+                                                    :type => sr_type
+
+      end
+
+    end
+  end
+end

data/lib/chef/knife/xenserver_sr_list.rb

@@ -0,0 +1,72 @@
+#
+# Author:: Sergio Rubio (<rubiojr@frameos.org>)
+# 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/xenserver_base'
+
+class Chef
+  class Knife
+    class XenserverSrList < Knife
+
+      include Knife::XenserverBase
+
+      banner "knife xenserver sr list (options)"
+      
+      option :sr_type,
+        :long => "--sr-types",
+        :description => "List only the types specified (comma separated types)",
+        :default => 'ext,lvm'
+      
+      option :numeric_utilisation,
+        :long => "--[no-]numeric-utilisation",
+        :description => "Print SR utilisation in bytes",
+        :default => false,
+        :boolean => true
+
+      def run
+        # Finding the current host (the one we used to get the connection)
+        #xshost = config[:xenserver_host] || Chef::Config[:knife][:xenserver_host]
+        #address = Resolv.getaddress xshost
+        #host = connection.hosts.find { |h| h.address == address }
+
+        # Storage Repositories belong to the pool,
+        # There's no way to list host storage repositories AFAIK
+        repositories = connection.storage_repositories
+        table = table do |t|
+          t.headings = %w{NAME TYPE UTILISATION UUID}
+          valid_types = config[:sr_type].split(',').map { |t| t.strip }
+          repositories.each do |sr|
+            # we only list LVM and EXT repositories by default
+            next unless valid_types.include? sr.type
+            if config[:numeric_utilisation]
+              utilisation = sr.physical_utilisation
+            else
+              if sr.physical_size.to_i > 0
+                utilisation = (sr.physical_utilisation.to_i * 100)/sr.physical_size.to_f * 100
+                utilisation = "%.2f%" % utilisation
+              else
+                utilisation = "100%"
+              end
+            end
+            t << [sr.name, sr.type, utilisation, sr.uuid]
+          end
+        end
+        puts table if !repositories.empty?
+      end
+
+    end
+  end
+end

data/lib/chef/knife/xenserver_vm_create.rb

@@ -158,6 +158,10 @@ class Chef
         :long => '--vm-domain DOMAIN',
         :description => 'DOMAIN of host to set in xenstore'
 
+      option :extra_vdis,
+        :long => '--extra-vdis "SR name":size1[,"SR NAME":size2,..]',
+        :description => 'Create and attach additional VDIs (size in MB)'
+
       def tcp_test_ssh(hostname)
         tcp_socket = TCPSocket.new(hostname, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
@@ -181,14 +185,12 @@ class Chef
         $stdout.sync = true
 
         unless config[:vm_template]
-          ui.error("You have not provided a valid template name. (--vm-template)")
-          exit 1
+          raise "You have not provided a valid template name. (--vm-template)"
         end
         
         vm_name = config[:vm_name]
         if not vm_name
-          ui.error("Invalid Virtual Machine name (--vm-name)")
-          exit 1
+          raise "Invalid Virtual Machine name (--vm-name)"
         end
 
         unless config[:vm_gateway]
@@ -207,8 +209,7 @@ class Chef
         end
 
         if template.nil?
-          ui.error "Template #{config[:vm_template]} not found."
-          exit 1
+          raise "Template #{config[:vm_template]} not found."
         end
 
         puts "Creating VM #{config[:vm_name].yellow}..."
@@ -217,6 +218,9 @@ class Chef
         vm = connection.servers.new :name => config[:vm_name],
                                     :template_name => config[:vm_template]
         vm.save :auto_start => false
+        # Useful for the global exception handler
+        @created_vm = vm
+
         if not config[:keep_template_networks]
           vm.vifs.each do |vif|
             vif.destroy
@@ -246,7 +250,10 @@ class Chef
         if config[:vm_tags]
           vm.set_attribute 'tags', config[:vm_tags].split(',')
         end
+
         vm.provision
+        # Create additional VDIs (virtual disks)
+        create_extra_vdis(vm)
         vm.start
         vm.reload
 
@@ -287,8 +294,7 @@ class Chef
               timeout -= 1
               if timeout == 0
                 puts
-                ui.error "Timeout trying to reach the VM. Couldn't find the IP address."
-                exit 1
+                raise "Timeout trying to reach the VM. Couldn't find the IP address."
               end
             end
             print "\n#{ui.color("Waiting for sshd... ", :magenta)}"
@@ -332,6 +338,66 @@ class Chef
         bootstrap.config[:ssh_password] = config[:ssh_password]
         bootstrap
       end
+
+      def create_extra_vdis(vm)
+        # Return if no extra VDIs were specified
+        return unless config[:extra_vdis]
+        count = 0
+
+        vdis = config[:extra_vdis].strip.chomp.split(',')
+        vdis.each do |vdi|
+          count += 1
+          # if options is "Storage Repository":size
+          if vdi =~ /.*:.*/
+            sr, size = vdi.split(':')
+          else #only size was specified
+            sr = nil
+            size = vdi
+          end
+          unless size =~ /^\d+$/
+            raise "Invalid VDI size. Not numeric."
+          end
+          # size in bytes
+          bsize = size.to_i * 1024 * 1024
+
+          # If the storage repository has been omitted,
+          # use the default SR from the first pool, othewise
+          # find the SR required
+          if sr.nil?
+            sr = connection.pools.first.default_sr 
+            ui.warn "No storage repository defined for extra VDI #{count}."
+            ui.warn "Using default SR from Pool: #{sr.name}"
+          else
+            found = connection.storage_repositories.find { |s| s.name == sr }
+            unless found
+              raise "Storage Repository #{sr} not available"
+            end
+            sr = found
+          end
+          
+          # Name of the VDI
+          name = "#{config[:vm_name]}-extra-vdi-#{count}"
+
+          puts "Creating extra VDI (#{size} MB, #{name}, #{sr.name || 'Default SR'})"
+          vdi = connection.vdis.create :name => name,
+                                       :storage_repository => sr,
+                                       :description => name,
+                                       :virtual_size => bsize.to_s
+
+          begin
+            # Attach the VBD
+            connection.vbds.create :server => vm, 
+                                   :vdi => vdi,
+                                   :userdevice => count.to_s,
+                                   :bootable => false
+          rescue => e
+            ui.error "Could not attach the VBD to the server"
+            # Try to destroy the VDI
+            vdi.destroy rescue nil
+            raise e
+          end
+        end
+      end
       
       def create_nics(networks, macs, vm)
         net_arr = networks.split(/,/).map { |x| { :network => x } }
@@ -349,8 +415,7 @@ class Chef
         nics.each do |n|
           net = networks.find { |net| net.name == n[:network] }
           if net.nil?
-            ui.error "Network #{n[:network]} not found"
-            exit 1
+            raise "Network #{n[:network]} not found"
           end
           nic_count += 1
           c = {

data/lib/knife-xenserver/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module XenServer
-    VERSION = "1.2.3"
+    VERSION = "1.3.1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,96 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: knife-xenserver
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.2.3
+  version: 1.3.1
 platform: ruby
 authors:
 - Sergio Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: terminal-table
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
-  name: chef
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.4'
-  name: fog
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: colored
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: uuidtools
 description: XenServer Support for Chef's Knife Command
 email:
 - rubiojr@frameos.org
@@ -107,7 +96,10 @@ files:
 - README.md
 - knife-xenserver.gemspec
 - lib/chef/knife/xenserver_base.rb
+- lib/chef/knife/xenserver_host_list.rb
 - lib/chef/knife/xenserver_network_list.rb
+- lib/chef/knife/xenserver_sr_create.rb
+- lib/chef/knife/xenserver_sr_list.rb
 - lib/chef/knife/xenserver_template_create.rb
 - lib/chef/knife/xenserver_template_list.rb
 - lib/chef/knife/xenserver_vm_create.rb
@@ -119,27 +111,25 @@ files:
 - vendor/fog/lib/fog/xenserver/requests/compute/add_attribute.rb
 homepage: http://github.com/rubiojr/knife-xenserver
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: XenServer Support for Chef's Knife Command
 test_files: []
-has_rdoc: true