knife-vcloud 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e1a6581ab79e682545433b7cd7bfa2517c1be97
-  data.tar.gz: dddf81518b3eeb63a7d65e4493d522c57c34a998
+  metadata.gz: 15f25cf5b3ff33de3c9781a8bf54ba462830e2fd
+  data.tar.gz: bfe80065421e3114b11639dbc8e693f526646628
 SHA512:
-  metadata.gz: 232a90edc098da6619adbba3d7f67d6db238ad46bce3243f7c3b2aa7eeed0f7e8cc81d846ea0978d32fdf5161414d10c8d096a16c7d2b8ba63dfcabfef258311
-  data.tar.gz: bdff29d51a5dee502ab2c1ebc6db8e15a0f34c464a1b5a903cf93ba0d61d922864591e4bc18a4c578593db61349daf861c095dc78959dba3c8e41226c14c67d1
+  metadata.gz: bd8e9aaa2c3771d518dcc6e2e4b9988d4adf9e58885b4d4576bd9b40a150ee21a6f220f525f795de7aa9bb2c10b73a1ae5ebd0ffd2d7a255e0a97e0aa0f03b29
+  data.tar.gz: 0897800fc0a73dc7ced36609748d3ee76c2d235119dc97e7388c545db48104f63459352510239e7e41a4ed390d2fbc68c5c7d0270a0ad9278866b9e634e6371b

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 Changes
 ==
+2014-02-06 (1.2.0)
+--
+
+This version requires vcloud-rest v. 1.2.0.
+
+FEATURES:
+
+* Honor local .chef/knife.rb precedence
+
+DEPRECATIONS:
+
+* Remove `vm config network` deprecated in 1.1.0
+* Remove *knife[:vcloud_password_login]* deprecated in 1.1.0
+
 2013-12-13 (1.1.0)
 --
 

data/README.md

@@ -33,7 +33,7 @@ PREREQUISITES
 --
 - chef >= 0.10.0
 - knife-windows
-- vcloud-rest ~> 1.0.0
+- vcloud-rest ~> 1.2.0
 
 USAGE
 --
@@ -64,7 +64,6 @@ USAGE
     knife vc vdc show VDC (options)
     knife vc vm bootstrap [VM] (options)
     knife vc vm config guest [VM] (options)
-    [DEPRECATED] knife vc vm config network [VM] [NETWORK_NAME] (options)
     knife vc vm network [add|delete|edit| [VM] [NETWORK] (options)
     knife vc vm reboot [VM] (options)
     knife vc vm reset [VM] (options)
@@ -80,8 +79,6 @@ USAGE
 A first configuration should be done using ```knife vc configure``` that would prompt user for
 credentials and vCloud URL.
 
-**DEPRECATION NOTE: *vcloud_password_login* has been deprecated and will be removed in future versions.**
-
 E.g.,
 
     $ bundle exec knife vc configure
@@ -444,8 +441,6 @@ This commands allows for basic VM network configuration and accepts several opti
 
 Please note that you must use the human readable name of the network (i.e., _TestNet\_1_).
 
-**DEPRECATION NOTE: The command *vm config network* has been deprecated and will be removed in future versions.**
-
 _Add example:_
 
     $ knife vc vm network edit testvm TST_Data

data/lib/chef/knife/common/vc_common.rb

@@ -46,12 +46,6 @@ class Chef
                  :description => "Your vCloud User",
                  :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user_login] = key }
 
-          option :vcloud_password_login,
-                 :short => "-P SECRET",
-                 :long => "--password-login SECRET",
-                 :description => "Your vCloud secret key",
-                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password_login] = key }
-
           option :vcloud_org_login,
                  :long => "--org-login ORGANIZATION",
                  :description => "Your vCloud Organization",
@@ -81,22 +75,16 @@ class Chef
         unless @connection
           pemfile = locate_config_value(:vcloud_pem)
 
-          if locate_config_value(:vcloud_password_login)
-            ui.info("#{ui.color('DEPRECATION WARNING:', :bold)} knife[:vcloud_password_login] is deprecated" \
-                  " and will be removed in the next version. You should remove it and run 'knife vc configure'.")
-            passwd = locate_config_value(:vcloud_password_login)
-          else
-            unless pemfile
-              raise ConfigurationError, "PEM file not configured. Please run 'knife vc configure'"
-            end
-
-            unless locate_config_value(:vcloud_password)
-              raise ConfigurationError, "Password not configured. Please run 'knife vc configure'"
-            end
+          unless pemfile
+            raise ConfigurationError, "PEM file not configured. Please run 'knife vc configure'"
+          end
 
-            passwd = get_password(pemfile)
+          unless locate_config_value(:vcloud_password)
+            raise ConfigurationError, "Password not configured. Please run 'knife vc configure'"
           end
 
+          passwd = get_password(pemfile)
+
           @connection = VCloudClient::Connection.new(
               locate_config_value(:vcloud_url),
               locate_config_value(:vcloud_user_login),
@@ -177,7 +165,8 @@ class Chef
       end
 
       # Generate a new key pair and store it on knife.rb
-      def generate_key(dir="#{File.join(Dir.home, '.chef')}", output="vc_key.pem")
+      def generate_key(output="vc_key.pem")
+        dir = File.dirname(get_config_file)
         key = OpenSSL::PKey::RSA.new 2048
 
         pemfile = File.join(dir, output)
@@ -206,7 +195,7 @@ class Chef
       #
       # It checks whether a given configuration already exists and, if so, updates it
       def store_config(key, value)
-        configfile = File.join(Dir.home, '.chef', 'knife.rb')
+        configfile = get_config_file
         old_config = File.open(configfile, 'r').readlines
         full_key = "knife[:#{key}]"
 
@@ -234,6 +223,16 @@ class Chef
       end
 
       private
+        def get_config_file
+          knife_cfg = File.join('.chef', 'knife.rb')
+
+          if File.exists?(File.join(Dir.pwd, knife_cfg))
+            File.join(Dir.pwd, knife_cfg)
+          else
+            File.join(Dir.home, knife_cfg)
+          end
+        end
+
         def humanize_elapsed_time(start_time, end_time)
           start_time = Time.parse(start_time || Time.now)
           end_time = Time.parse(end_time || Time.now)

data/lib/chef/knife/vc_commands.rb

@@ -55,7 +55,6 @@ require 'chef/knife/vapp/vc_vapp_snapshot'
 # VM
 require 'chef/knife/common/vc_vm_common'
 require 'chef/knife/vm/vc_vm_config_guest'
-require 'chef/knife/vm/vc_vm_config_network'
 require 'chef/knife/vm/vc_vm_network'
 require 'chef/knife/vm/vc_vm_show'
 require 'chef/knife/vm/vc_vm_set_info'

data/lib/knife-vcloud/version.rb

@@ -1,3 +1,3 @@
 module KnifeVCloud
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcloud
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Stefano Tortarolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,6 @@ files:
 - lib/chef/knife/vdc/vc_vdc_show.rb
 - lib/chef/knife/vm/vc_vm_bootstrap.rb
 - lib/chef/knife/vm/vc_vm_config_guest.rb
-- lib/chef/knife/vm/vc_vm_config_network.rb
 - lib/chef/knife/vm/vc_vm_network.rb
 - lib/chef/knife/vm/vc_vm_reboot.rb
 - lib/chef/knife/vm/vc_vm_reset.rb

data/lib/chef/knife/vm/vc_vm_config_network.rb

@@ -1,84 +0,0 @@
-#
-# Author:: Stefano Tortarolo (<stefano.tortarolo@gmail.com>)
-# Copyright:: Copyright (c) 2012-2013
-# 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.
-#
-
-class Chef
-  class Knife
-    class VcVmConfigNetwork < Chef::Knife
-      include Knife::VcCommon
-      include Knife::VcVmCommon
-
-      banner "knife vc vm config network [VM] [NETWORK_NAME] (options)"
-
-      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-[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 (default POOL)",
-             :default => 'POOL'
-
-      def run
-        $stdout.sync = true
-
-        vm_arg = @name_args.shift
-        network_name = @name_args.shift
-        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),
-        }
-
-        connection.login
-
-        deprecation_msg("vm network [add|delete|edit]")
-
-        vm = get_vm(vm_arg)
-
-        stop_if_running(connection, vm)
-
-        ui.msg "VM network configuration..."
-        task_id = connection.set_vm_network_config vm[:id], network_name, config
-
-        if wait_task(connection, task_id)
-          ui.msg "Forcing Guest Customization to apply changes..."
-          task_id = connection.force_customization_vm vm[:id]
-          wait_task(connection, task_id)
-        end
-
-        connection.logout
-      end
-    end
-  end
-end