knife-esx 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Sat Feb 25 12:16:01 CET 2012 - 0.1.5 
+
+* Patch from @pperezrubio adding multiple networks support
+
+    knife esx vm create --vm-disk ubuntu-oneiric.vmdk \
+                        --vm-name testvm --datastore datastore1 \
+                        --esx-host 192.168.88.1 --ssh-user ubuntu \
+                        --ssh-password ubuntu \
+                        --vm-network "VLAN-Integration,VLAN-Test"
+
+
+This will create a VM with two NICs, attaching them to the VLAN-Integration and VLAN-Test networks respectively.
+
+

data/lib/chef/knife/esx_vm_create.rb

@@ -114,6 +114,18 @@ class Chef
         :default => false,
         :proc => Proc.new { true }
 
+      option :vm_network,
+        :short => "-N network[,network..]",
+        :long => "--vm-network",
+        :description => "Network where nic is attached to",
+        :default => 'VM Network'
+
+      option :mac_address,
+        :short => "-M mac[,mac..]",
+        :long => "--mac-address",
+        :description => "Mac address list",
+        :default => nil
+
       def tcp_test_ssh(hostname)
         tcp_socket = TCPSocket.new(hostname, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
@@ -152,6 +164,7 @@ class Chef
           exit 1
         end
 
+          
         datastore = config[:datastore]
         memory = config[:memory]
         vm_disk = config[:vm_disk]
@@ -161,13 +174,14 @@ class Chef
         connection.remote_command "mkdir #{destination_path}"
         puts "#{ui.color("Creating VM... ", :magenta)}"
         puts "#{ui.color("Importing VM disk... ", :magenta)}"
+
         connection.import_disk vm_disk, destination_path + "/#{vm_name}.vmdk"
         vm = connection.create_vm :vm_name => vm_name,
                              :datastore => datastore,
                              :disk_file => "#{vm_name}/#{vm_name}.vmdk",
                              :memory => memory,
                              :guest_id => guest_id,
-                             :nics => [{:mac_address => nil, :network => "VM Network"}]
+                             :nics => create_nics(config[:vm_network], config[:mac_address])
         vm.power_on
         
         puts "#{ui.color("VM Name", :cyan)}: #{vm.name}"
@@ -221,6 +235,15 @@ class Chef
         bootstrap
       end
 
+      def create_nics(networks, macs)
+        net_arr = networks.split(/,/).map { |x| { :network => x } }
+        if macs
+          mac_arr = macs.split(/,/)
+          net_arr.each_index { |x| net_arr[x][:mac_address] = mac_arr[x] if mac_arr[x] and !mac_arr[x].empty? }
+        else
+          net_arr
+        end
+      end
     end
   end
 end

data/lib/knife-esx/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module ESX 
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-esx
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: esx
-  requirement: &10223740 !ruby/object:Gem::Requirement
+  requirement: &14262920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *10223740
+  version_requirements: *14262920
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &10223060 !ruby/object:Gem::Requirement
+  requirement: &14262220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10223060
+  version_requirements: *14262220
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &10222160 !ruby/object:Gem::Requirement
+  requirement: &14261380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *10222160
+  version_requirements: *14261380
 description: ESX Support for Chef's Knife Command
 email:
 - rubiojr@frameos.org
@@ -54,6 +54,7 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files:
+- CHANGELOG.md
 - LICENSE
 - README.rdoc
 - features/esx.feature
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: ESX Support for Chef's Knife Command