knife-vcloud 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,4 +1,16 @@
 Changes
+==
+2012-12-24 (0.2.0)
+--
+
+FEATURES:
+* Add command for basic VM Guest Customization configuration
+* Add command for basic VM Network configuration
+* Add command for basic vApp Network configuration
+
+FIXES:
+* Renamed _Common#msg_ to _Common#out\_msg_
+
 ==
 2012-12-21 (0.1.0)
 --

data/README.md

@@ -25,7 +25,11 @@ FEATURES
 - show VDCs
 - show Catalogs
 - show Catalog Items
-- create/start/stop/delete vApps
+- create/start/stop/delete/show vApps
+- show VMs
+- basic vApp network configuration
+- basic VM network configuration
+- basic VM Guest Customization configuration
 
 PREREQUISITES
 --
@@ -38,16 +42,21 @@ USAGE
 
 ###Available commands
 
-    knife vc catalog item show [ITEM_ID] (options)
+    knife vc catalog item show [CATALOG_ID] (options)
     knife vc catalog show [CATALOG_ID] (options)
     knife vc login (options)
     knife vc org list (options)
     knife vc org show [ORG_ID] (options)
+    knife vc vapp config network [VAPP_ID] [NETWORK_NAME] (options)
     knife vc vapp create [VDC_ID] [NAME] [DESCRIPTION] [TEMPLATE_ID] (options)
     knife vc vapp delete [VAPP_ID] (options)
+    knife vc vapp show [VAPP_ID] (options)
     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 show [VM_ID] (options)
 
 ###Configuration
 All commands accept the following options:
@@ -193,6 +202,30 @@ _Example:_
     Name                  Status         IPs             ID
     CENTOS63              running        10.102.46.237   8b943bf9-a8ca-4d41-b97f-316c3aa891ea
 
+###vApp's network configuration
+This command allows for basic vApp network configuration.
+
+_Example:_
+*TBD*
+
+###Show VM's details
+This command shows details about a given VM.
+
+_Example:_
+*TBD*
+
+###VM's network configuration
+This command allows for basic VM network configuration.
+
+_Example:_
+*TBD*
+
+###VM's Guest Customization configuration
+This command allows for basic VM Guest Customization configuration.
+
+_Example:_
+*TBD*
+
 LICENSE
 --
 

data/lib/chef/knife/common.rb

@@ -32,7 +32,7 @@ module KnifeVCloud
       @connection
     end
 
-    def msg(label, value)
+    def out_msg(label, value)
       if value && !value.empty?
         puts "#{ui.color(label, :cyan)}: #{value}"
       end
@@ -46,7 +46,7 @@ module KnifeVCloud
     def wait_task(connection, task_id)
       status, errormsg, start_time, end_time = connection.wait_task_completion task_id
       puts "Done!"
-      msg("Summary", "Status: #{ui.color(status, :cyan)} - started at #{start_time} and ended at #{end_time}")
+      out_msg("Summary", "Status: #{ui.color(status, :cyan)} - started at #{start_time} and ended at #{end_time}")
 
       if errormsg
         puts ui.color("ATTENTION: #{errormsg}", :red)

data/lib/chef/knife/vc_login.rb

@@ -63,7 +63,7 @@ module KnifeVCloud
       $stdout.sync = true
 
       connection.login
-      msg("Authenticated successfully, code", connection.auth_key)
+      out_msg("Authenticated successfully, code", connection.auth_key)
 
       connection.logout
     end

data/lib/chef/knife/vc_vapp_config_network.rb

@@ -59,6 +59,18 @@ module KnifeVCloud
            :description => "vCloud API version (1.5 and 5.1 supported)",
            :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
 
+    option :fence_mode,
+           :short => "-F FENCE_MODE",
+           :long => "--fence-mode FENCE_MODE",
+           :description => "Set Fence Mode (e.g., Isolated, Bridged)",
+           :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 }
+
     def run
       $stdout.sync = true
 
@@ -67,9 +79,12 @@ module KnifeVCloud
 
       connection.login
 
-      task_id, response = connection.set_vapp_network_config vapp_id, network_name
+      config = {
+        :fence_mode => locate_config_value(:fence_mode),
+        :retain_net => locate_config_value(:retain_net)
+      }
 
-      puts response
+      task_id, response = connection.set_vapp_network_config vapp_id, network_name, config
 
       print "vApp network configuration..."
       wait_task(connection, task_id)

data/lib/chef/knife/vc_vapp_show.rb

@@ -75,10 +75,10 @@ module KnifeVCloud
       name, description, status, ip, vms_hash = connection.show_vapp vapp_id
       connection.logout
 
-      msg("Name", name)
-      msg("Description", description)
-      msg("Status", status)
-      msg("IP", ip)
+      out_msg("Name", name)
+      out_msg("Description", description)
+      out_msg("Status", status)
+      out_msg("IP", ip)
 
       vms_hash.each do |k, v|
         list << (k || '')

data/lib/chef/knife/vc_vm_config_guest.rb

@@ -59,6 +59,19 @@ module KnifeVCloud
            :description => "vCloud API version (1.5 and 5.1 supported)",
            :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
 
+    option :guest_enabled,
+           :short => "-E ENABLED",
+           :long => "--enable-guest true|false",
+           :description => "Toggle Guest Customization"
+
+    option :admin_passwd_enabled,
+           :long => "--admin-passwd-enabled true|false",
+           :description => "Toggle Admin Password"
+
+    option :admin_passwd,
+           :long => "--admin-passwd ADMIN_PASSWD",
+           :description => "Set Admin Password"
+
     def run
       $stdout.sync = true
 
@@ -67,9 +80,13 @@ module KnifeVCloud
 
       connection.login
 
-      task_id, response = connection.set_vm_guest_customization vm_id, computer_name, {:enabled => true}
+      config = {
+        :enabled => locate_config_value(:guest_enabled),
+        :admin_passwd_enabled => locate_config_value(:admin_passwd_enabled),
+        :admin_passwd => locate_config_value(:admin_passwd)
+      }
 
-      puts response
+      task_id, response = connection.set_vm_guest_customization vm_id, computer_name, config
 
       print "VM network configuration..."
       wait_task(connection, task_id)

data/lib/chef/knife/vc_vm_config_network.rb

@@ -59,6 +59,26 @@ module KnifeVCloud
            :description => "vCloud API version (1.5 and 5.1 supported)",
            :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
 
+    option :vm_net_primary_index,
+           :long => "--net-primary NETWORK_PRIMARY_IDX",
+           :description => "Index of the primary network interface"
+
+    option :vm_net_index,
+           :long => "--net-index NETWORK_IDX",
+           :description => "Index of the current network interface"
+
+    option :vm_net_ip,
+           :long => "--net-ip NETWORK_IP",
+           :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"
+
+    option :vm_ip_allocation_mode,
+           :long => "--ip-allocation-mode ALLOCATION_MODE",
+           :description => "Set IP allocation mode of the current network interface (e.g., POOL)"
+
     def run
       $stdout.sync = true
 
@@ -69,8 +89,6 @@ module KnifeVCloud
 
       task_id, response = connection.set_vm_network_config vm_id, network_name, {:ip_allocation_mode => 'POOL'}
 
-      puts response
-
       print "VM network configuration..."
       wait_task(connection, task_id)
 

data/lib/chef/knife/vc_vm_show.rb

@@ -74,7 +74,7 @@ module KnifeVCloud
       os_desc, networks, guest_customizations = connection.show_vm vm_id
       connection.logout
 
-      msg("OS Name", os_desc)
+      out_msg("OS Name", os_desc)
 
       networks.each do |network, values|
         list << ui.color('Network', :bold)
@@ -85,8 +85,8 @@ module KnifeVCloud
         end
       end
 
-      list << ui.color('Customizations', :bold)
-      list << ''
+      list << ['', '', ui.color('Guest Customizations', :bold), '']
+      list.flatten!
       guest_customizations.each do |k, v|
         list << (pretty_symbol(k) || '')
         list << (v || '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef