knife-vcloud 0.2.0 → 0.2.1

data/lib/chef/knife/vc_vm_config_guest.rb

@@ -16,82 +16,49 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVmConfigGuest < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVmConfigGuest < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vm config guest [VAPP_ID] [COMPUTER_NAME] (options)"
-
-    option :vcloud_url,
-           :short => "-H URL",
-           :long => "--vcloud-url URL",
-           :description => "The vCloud endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-    option :vcloud_user,
-           :short => "-U USER",
-           :long => "--vcloud-user USER",
-           :description => "Your vCloud User",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
-
-    option :vcloud_password,
-           :short => "-P SECRET",
-           :long => "--vcloud-password SECRET",
-           :description => "Your vCloud secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
-
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
-
-    option :vcloud_api_version,
-           :short => "-A API_VERSION",
-           :long => "--vcloud-api-version API_VERSION",
-           :description => "vCloud API version (1.5 and 5.1 supported)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
+      banner "knife vc vm config guest [VAPP_ID] [COMPUTER_NAME] (options)"
 
-    option :guest_enabled,
-           :short => "-E ENABLED",
-           :long => "--enable-guest true|false",
-           :description => "Toggle Guest Customization"
+      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_enabled,
+             :long => "--admin-passwd-enabled true|false",
+             :description => "Toggle Admin Password"
 
-    option :admin_passwd,
-           :long => "--admin-passwd ADMIN_PASSWD",
-           :description => "Set Admin Password"
+      option :admin_passwd,
+             :long => "--admin-passwd ADMIN_PASSWD",
+             :description => "Set Admin Password"
 
-    def run
-      $stdout.sync = true
+      def run
+        $stdout.sync = true
 
-      vm_id = @name_args.shift
-      computer_name = @name_args.shift
+        vm_id = @name_args.shift
+        computer_name = @name_args.shift
 
-      connection.login
+        connection.login
 
-      config = {
-        :enabled => locate_config_value(:guest_enabled),
-        :admin_passwd_enabled => locate_config_value(:admin_passwd_enabled),
-        :admin_passwd => locate_config_value(:admin_passwd)
-      }
+        config = {
+          :enabled => locate_config_value(:guest_enabled),
+          :admin_passwd_enabled => locate_config_value(:admin_passwd_enabled),
+          :admin_passwd => locate_config_value(:admin_passwd)
+        }
 
-      task_id, response = connection.set_vm_guest_customization vm_id, computer_name, config
+        task_id, response = connection.set_vm_guest_customization vm_id, computer_name, config
 
-      print "VM network configuration..."
-      wait_task(connection, task_id)
+        print "VM network configuration..."
+        wait_task(connection, task_id)
 
-      connection.logout
+        connection.logout
+      end
     end
   end
 end

data/lib/chef/knife/vc_vm_config_network.rb

@@ -16,83 +16,50 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVmConfigNetwork < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVmConfigNetwork < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vm config network [VAPP_ID] [NETWORK_NAME] (options)"
-
-    option :vcloud_url,
-           :short => "-H URL",
-           :long => "--vcloud-url URL",
-           :description => "The vCloud endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-    option :vcloud_user,
-           :short => "-U USER",
-           :long => "--vcloud-user USER",
-           :description => "Your vCloud User",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
-
-    option :vcloud_password,
-           :short => "-P SECRET",
-           :long => "--vcloud-password SECRET",
-           :description => "Your vCloud secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
-
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
-
-    option :vcloud_api_version,
-           :short => "-A API_VERSION",
-           :long => "--vcloud-api-version API_VERSION",
-           :description => "vCloud API version (1.5 and 5.1 supported)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
+      banner "knife vc vm config network [VAPP_ID] [NETWORK_NAME] (options)"
 
-    option :vm_net_primary_index,
-           :long => "--net-primary NETWORK_PRIMARY_IDX",
-           :description => "Index of the primary network interface"
+      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_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_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_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)"
+      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
+      def run
+        $stdout.sync = true
 
-      vm_id = @name_args.shift
-      network_name = @name_args.shift
+        vm_id = @name_args.shift
+        network_name = @name_args.shift
 
-      connection.login
+        connection.login
 
-      task_id, response = connection.set_vm_network_config vm_id, network_name, {:ip_allocation_mode => 'POOL'}
+        task_id, response = connection.set_vm_network_config vm_id, network_name, {:ip_allocation_mode => 'POOL'}
 
-      print "VM network configuration..."
-      wait_task(connection, task_id)
+        print "VM network configuration..."
+        wait_task(connection, task_id)
 
-      connection.logout
+        connection.logout
+      end
     end
   end
-end
+end

data/lib/chef/knife/vc_vm_show.rb

@@ -16,82 +16,49 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVmShow < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVmShow < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vm show [VM_ID] (options)"
-
-    option :vcloud_url,
-           :short => "-H URL",
-           :long => "--vcloud-url URL",
-           :description => "The vCloud endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-    option :vcloud_user,
-           :short => "-U USER",
-           :long => "--vcloud-user USER",
-           :description => "Your vCloud User",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
-
-    option :vcloud_password,
-           :short => "-P SECRET",
-           :long => "--vcloud-password SECRET",
-           :description => "Your vCloud secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
-
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
+      banner "knife vc vm show [VM_ID] (options)"
 
-    option :vcloud_api_version,
-           :short => "-A API_VERSION",
-           :long => "--vcloud-api-version API_VERSION",
-           :description => "vCloud API version (1.5 and 5.1 supported)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
+      def pretty_symbol(key)
+        key.to_s.gsub('_', ' ').capitalize
+      end
 
-    def pretty_symbol(key)
-      key.to_s.gsub('_', ' ').capitalize
-    end
+      def run
+        $stdout.sync = true
 
-    def run
-      $stdout.sync = true
+        vm_id = @name_args.first
 
-      vm_id = @name_args.first
+        list = []
 
-      list = []
+        connection.login
+        os_desc, networks, guest_customizations = connection.show_vm vm_id
+        connection.logout
 
-      connection.login
-      os_desc, networks, guest_customizations = connection.show_vm vm_id
-      connection.logout
+        out_msg("OS Name", os_desc)
 
-      out_msg("OS Name", os_desc)
+        networks.each do |network, values|
+          list << ui.color('Network', :bold)
+          list << (network || '')
+          values.each do |k, v|
+            list << (pretty_symbol(k) || '')
+            list << (v || '')
+          end
+        end
 
-      networks.each do |network, values|
-        list << ui.color('Network', :bold)
-        list << (network || '')
-        values.each do |k, v|
+        list << ['', '', ui.color('Guest Customizations', :bold), '']
+        list.flatten!
+        guest_customizations.each do |k, v|
           list << (pretty_symbol(k) || '')
           list << (v || '')
         end
+        puts ui.list(list, :columns_across, 2)
       end
-
-      list << ['', '', ui.color('Guest Customizations', :bold), '']
-      list.flatten!
-      guest_customizations.each do |k, v|
-        list << (pretty_symbol(k) || '')
-        list << (v || '')
-      end
-      puts ui.list(list, :columns_across, 2)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -69,9 +69,9 @@ files:
 - CHANGELOG.md
 - README.md
 - LICENSE
-- lib/chef/knife/common.rb
 - lib/chef/knife/vc_catalog_item_show.rb
 - lib/chef/knife/vc_catalog_show.rb
+- lib/chef/knife/vc_common.rb
 - lib/chef/knife/vc_login.rb
 - lib/chef/knife/vc_org_list.rb
 - lib/chef/knife/vc_org_show.rb

data/lib/chef/knife/common.rb

@@ -1,56 +0,0 @@
-#
-# Author:: Stefano Tortarolo (<stefano.tortarolo@gmail.com>)
-# Copyright:: Copyright (c) 2012
-# 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.
-#
-
-module KnifeVCloud
-  # Module for operations common among commands
-  module Common
-    def connection
-      unless @connection
-        @connection = VCloudClient::Connection.new(
-            locate_config_value(:vcloud_url),
-            locate_config_value(:vcloud_user),
-            locate_config_value(:vcloud_password),
-            locate_config_value(:vcloud_org),
-            locate_config_value(:vcloud_api_version)
-        )
-      end
-      @connection
-    end
-
-    def out_msg(label, value)
-      if value && !value.empty?
-        puts "#{ui.color(label, :cyan)}: #{value}"
-      end
-    end
-
-    def locate_config_value(key)
-      key = key.to_sym
-      Chef::Config[:knife][key] || config[key]
-    end
-
-    def wait_task(connection, task_id)
-      status, errormsg, start_time, end_time = connection.wait_task_completion task_id
-      puts "Done!"
-      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)
-      end
-    end
-  end
-end