knife-xenserver 1.2 → 1.2.1

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 1.2.1 - Mon 12 Nov 2012
+
+* Maks3w patches for xenserver-automated related stuff
+
+* Added --match flag to the 'vm delete' command.
+
+  If --match is used, every VM matching VM_NAME will be deleted
+
+* Deprecate --force-delete option in 'vm delete' since --yes should
+  be used to confirm (force).
+
 # 1.2 - Thu 25 Oct 2012 
 
 * Greatly improved 'vm list' command

data/README.md

@@ -61,7 +61,8 @@ Create a VM from template and add two custom VIFs in networks 'Integration-VLAN'
                               --vm-networks 'Integration-VLAN,Another-VLAN' \
                               --mac-addresses 11:22:33:44:55:66
 
-Create a VM from template and supply ip/host/domain configuration. Requires installation of xe-automater scripts (https://github.com/adamlau/xenserver-automater)
+Create a VM from template and supply ip/host/domain configuration. Requires installation of xe-automater scripts
+(https://github.com/krobertson/xenserver-automater)
 
     knife xenserver vm create   --vm-template my-template -x root --keep-template-networks \
                                 --vm-name my-hostname \

data/lib/chef/knife/xenserver_vm_create.rb

@@ -236,8 +236,8 @@ class Chef
         attrs = {}
         (attrs['vm-data/ip'] = config[:vm_ip]) if config[:vm_ip]
         (attrs['vm-data/gw'] = config[:vm_gateway]) if config[:vm_gateway]
-        (attrs['vm-data/netmask'] = config[:vm_netmask]) if config[:vm_netmask]
-        (attrs['vm-data/dns'] = config[:vm_dns]) if config[:vm_dns]
+        (attrs['vm-data/nm'] = config[:vm_netmask]) if config[:vm_netmask]
+        (attrs['vm-data/ns'] = config[:vm_dns]) if config[:vm_dns]
         (attrs['vm-data/dm'] = config[:vm_domain]) if config[:vm_domain]
         if !attrs.empty?
           puts "Adding attributes to xenstore..."

data/lib/chef/knife/xenserver_vm_delete.rb

@@ -30,23 +30,41 @@ class Chef
         :long => "--force-delete NO",
         :default => 'no',
         :description => "Do not confirm VM deletion when yes"
+      
+      option :match,
+        :long => "--match",
+        :description => "Delete VMs matching VM_NAME (regex)",
+        :boolean => true
 
       def run
+        if config[:force_delete] =~ /y|yes/i
+          ui.warn "--force-delete is deprecated."
+          ui.warn "Use --yes to confirm deletion."
+          config[:yes] = true 
+        end
         deleted = []
         connection.servers.each do |vm|
+          to_delete = []
           @name_args.each do |vm_name|
-            if (vm_name == vm.name) or (vm_name == vm.uuid)
-              if config[:force_delete] =~ /(no|NO|false|FALSE)/
-                confirm("Do you really want to #{'delete'.bold.red} this virtual machine #{vm.name.bold.red}")
+            if config[:match]
+              if vm.name =~ /#{vm_name}/
+                to_delete << vm
+              end
+            else
+              if (vm_name == vm.name) or (vm_name == vm.uuid)
+                to_delete << vm
               end
-              vm.destroy
-              deleted << vm_name
-              ui.info("#{'Deleted'.yellow} virtual machine #{vm.name.yellow} [uuid: #{vm.uuid}]")
             end
           end
+          to_delete.each do |vm|
+            confirm("Do you really want to #{'delete'.bold.red} this virtual machine #{vm.name.bold.red}")
+            vm.destroy
+            deleted << vm.name 
+            ui.info("#{'Deleted'.yellow} virtual machine #{vm.name.yellow} [uuid: #{vm.uuid}]")
+          end
         end
         @name_args.each do |vm_name|
-          ui.warn "Virtual Machine #{vm_name} not found" if not deleted.include?(vm_name)
+          ui.warn "Virtual Machine#{'(s) matching' if config[:match]} '#{vm_name}' not found" if deleted.size == 0
         end
       end
 

data/lib/knife-xenserver/version.rb

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

metadata

@@ -1,25 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: knife-xenserver
 version: !ruby/object:Gem::Version
-  version: '1.2'
   prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - Sergio Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  type: :runtime
   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
@@ -27,15 +26,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: terminal-table
 - !ruby/object:Gem::Dependency
-  name: chef
+  type: :runtime
   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
@@ -43,15 +42,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.10'
+  name: chef
 - !ruby/object:Gem::Dependency
-  name: fog
+  type: :runtime
   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
@@ -59,15 +58,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.4'
+  name: fog
 - !ruby/object:Gem::Dependency
-  name: colored
+  type: :runtime
   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
@@ -75,15 +74,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: colored
 - !ruby/object:Gem::Dependency
-  name: alchemist
+  type: :runtime
   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
@@ -91,15 +90,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: alchemist
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  type: :runtime
   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
@@ -107,6 +106,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: uuidtools
 description: XenServer Support for Chef's Knife Command
 email:
 - rubiojr@frameos.org