knife-vcloud 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,12 +1,19 @@
 Changes
 ==
+2012-12-27 (0.2.2)
+--
+
+FIXES:
+* VM Network config: use command line arguments
+* Properly use boolean options
+* Minor fixes
+
 2012-12-27 (0.2.1)
 --
 
 FIXES:
 * Change namespace to fix import error under 1.9.x (system-wide)
 
-==
 2012-12-24 (0.2.0)
 --
 
@@ -18,7 +25,6 @@ FEATURES:
 FIXES:
 * Renamed _Common#msg_ to _Common#out\_msg_
 
-==
 2012-12-21 (0.1.0)
 --
 

data/README.md

@@ -54,8 +54,8 @@ USAGE
     knife vc vapp start [VAPP_ID] (options)
     knife vc vapp stop [VAPP_ID] (options)
     knife vc vdc show [VDC_ID] (options)
-    knife vc vm config guest [VAPP_ID] [COMPUTER_NAME] (options)
-    knife vc vm config network [VAPP_ID] [NETWORK_NAME] (options)
+    knife vc vm config guest [VM_ID] [COMPUTER_NAME] (options)
+    knife vc vm config network [VM_ID] [NETWORK_NAME] (options)
     knife vc vm show [VM_ID] (options)
 
 ###Configuration
@@ -185,7 +185,7 @@ This command creates a vApp starting from a template (see catalog item).
 
 _Example:_
 
-    $ knife vc vapp create 440d5134-d2dd-4be7-8692-79a28c86f55b TestVM "Test vm description" 14b63ef2-fe93-4d0b-91f0-ccbd3847c665
+    $ knife vc vapp create 440d5134-d2dd-4be7-8692-79a28c86f55b TestvApp "Test vApp description" 14b63ef2-fe93-4d0b-91f0-ccbd3847c665
     vApp creation...Done!
     Summary: Status: success - started at 2012-12-19T17:02:32.797+01:00 and ended at 2012-12-19T17:02:53.943+01:00
     vApp created with ID: 9cdd92ad-ab65-467f-abe1-075e35c050ec

data/lib/chef/knife/vc_vapp_config_network.rb

@@ -32,10 +32,11 @@ class Chef
              :proc => Proc.new { |key| Chef::Config[:knife][:fence_mode] = key }
 
       option :retain_network,
-             :short => "-R RETAIN_NETWORK",
-             :long => "--retain-network RETAIN_NETWORK",
-             :description => "Toggle Retain Network across deployments (e.g., true, false)",
-             :proc => Proc.new { |key| Chef::Config[:knife][:retain_network] = key }
+             :long => "--[no-]retain-network",
+             :description => "Toggle Retain Network across deployments (default true)",
+             :proc => Proc.new { |key| Chef::Config[:knife][:retain_network] = key },
+             :boolean => true,
+             :default => true
 
       def run
         $stdout.sync = true

data/lib/chef/knife/vc_vm_config_guest.rb

@@ -23,16 +23,19 @@ class Chef
     class VcVmConfigGuest < Chef::Knife
       include Knife::VcCommon
 
-      banner "knife vc vm config guest [VAPP_ID] [COMPUTER_NAME] (options)"
+      banner "knife vc vm config guest [VM_ID] [COMPUTER_NAME] (options)"
 
       option :guest_enabled,
-             :short => "-E ENABLED",
-             :long => "--enable-guest true|false",
-             :description => "Toggle Guest Customization"
+             :long => "--[no-]guest",
+             :description => "Toggle Guest Customization (default true)",
+             :boolean => true,
+             :default => true
 
       option :admin_passwd_enabled,
-             :long => "--admin-passwd-enabled true|false",
-             :description => "Toggle Admin Password"
+             :long => "--use-[no-]admin-passwd",
+             :description => "Toggle Admin Password (default true)",
+             :boolean => true,
+             :default => true
 
       option :admin_passwd,
              :long => "--admin-passwd ADMIN_PASSWD",

data/lib/chef/knife/vc_vm_config_network.rb

@@ -23,7 +23,7 @@ class Chef
     class VcVmConfigNetwork < Chef::Knife
       include Knife::VcCommon
 
-      banner "knife vc vm config network [VAPP_ID] [NETWORK_NAME] (options)"
+      banner "knife vc vm config network [VM_ID] [NETWORK_NAME] (options)"
 
       option :vm_net_primary_index,
              :long => "--net-primary NETWORK_PRIMARY_IDX",
@@ -38,12 +38,15 @@ class Chef
              :description => "IP of the current network interface"
 
       option :vm_net_is_connected,
-             :long => "--net-is-connected true|false",
-             :description => "Toggle IsConnected flag of the current network interface"
+             :long => "--net-[no-]connected",
+             :description => "Toggle IsConnected flag of the current network interface (default true)",
+             :boolean => true,
+             :default => true
 
       option :vm_ip_allocation_mode,
              :long => "--ip-allocation-mode ALLOCATION_MODE",
-             :description => "Set IP allocation mode of the current network interface (e.g., POOL)"
+             :description => "Set IP allocation mode of the current network interface (default POOL)",
+             :default => 'POOL'
 
       def run
         $stdout.sync = true
@@ -53,7 +56,15 @@ class Chef
 
         connection.login
 
-        task_id, response = connection.set_vm_network_config vm_id, network_name, {:ip_allocation_mode => 'POOL'}
+        config = {
+          :primary_index => locate_config_value(:vm_net_primary_index),
+          :network_index => locate_config_value(:vm_net_index),
+          :ip => locate_config_value(:vm_net_ip),
+          :is_connected => locate_config_value(:vm_net_is_connected),
+          :ip_allocation_mode => locate_config_value(:vm_ip_allocation_mode),
+        }
+
+        task_id, response = connection.set_vm_network_config vm_id, network_name, config
 
         print "VM network configuration..."
         wait_task(connection, task_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: