knife-openstack 1.3.2.pre → 1.3.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 261ad74f7d4dd9418c60d6b6e744c20cb0c7cf4e
-  data.tar.gz: 29b8fac9abe06d9e13f62daa3bc47a38577ae5d5
+  metadata.gz: b05331ec3545a48444fc877d7889747529f0d7e3
+  data.tar.gz: 92baa1e81349f00f1e7f58df5b2d297b15a2f51f
 SHA512:
-  metadata.gz: af0598ea940d2ff7da0d956aafb55935e87e5d92b23689e04474d93372af89a092aa4e9f5473addb0470c8b39f2aa500450c9b1ae229b0d40cd3293fe541969a
-  data.tar.gz: 1388e094ba739d98c3219dfa8ac4b50eeebc0ce3042514e03393f7aebeea1800766e61054dc0676cc1e5b256fb3e05fbac7b7067238ab0bdbb3947d1def60705
+  metadata.gz: b2adbd1e48f537165d606ac669515a0d39f26a34e345656a88b4623a4a05ca265d8f5f36f59d1b59bd0f7adbef392286836cae918f07a9da28b9380b1ef89511
+  data.tar.gz: 20d830cb5e373c9ba05020678c41385cb1d87758ca14777bb858b140c743e0ee244de71410194c9119021c4c5f0ce7544d6c569f4caf6f48f9dddad955eddaf0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.3.2.pre
+* Fix cloud command class loading #174
+* Fix for #178 for the listing of ips with `knife openstack server list`
+
 ## v1.2.0
 * Allow users to specify alternate private networks. #163
 * Vol sched 1.0.0work #142

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in knife-openstack.gemspec
 gemspec

data/Rakefile

@@ -2,34 +2,13 @@
 # Copyright:: Copyright (c) 2013 Chef Software, Inc.
 
 require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+require 'rspec/core/rake_task'
 
-require 'rubygems'
-require 'rubygems/package_task'
+RuboCop::RakeTask.new
 
-task :default => :all
-task :all => [:spec, :uninstall, :install]
+RSpec::Core::RakeTask.new(:spec)
 
-# Packaging
-GEM_NAME = "knife-openstack"
-require File.dirname(__FILE__) + '/lib/knife-openstack/version'
-spec = eval(File.read("knife-openstack.gemspec"))
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "uninstall #{GEM_NAME}-#{Knife::OpenStack::VERSION}.gem from system..."
-task :uninstall do
-  sh %{gem uninstall #{GEM_NAME} -x -v #{Knife::OpenStack::VERSION} }
-end
-
-# rspec
-begin
-  require 'rspec/core/rake_task'
-  desc "Run all specs in spec directory"
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = 'spec/unit/**/*_spec.rb'
-  end
-rescue LoadError
-  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
-end
+task default: [:rubocop, :spec]

data/knife-openstack.gemspec

@@ -1,28 +1,28 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "knife-openstack/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'knife-openstack/version'
 
 Gem::Specification.new do |s|
-  s.name        = "knife-openstack"
+  s.name        = 'knife-openstack'
   s.version     = Knife::OpenStack::VERSION
   s.version = "#{s.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS']
-  s.platform    = Gem::Platform::RUBY
+  s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README.md", "LICENSE" ]
-  s.authors     = ["JJ Asghar"]
-  s.email       = ["jj@chef.io"]
-  s.homepage    = "https://github.com/chef/knife-openstack"
-  s.summary     = %q{A Chef knife plugin for OpenStack clouds.}
-  s.description = %q{A Chef knife plugin for OpenStack clouds.}
+  s.extra_rdoc_files = ['README.md', 'LICENSE']
+  s.authors     = ['JJ Asghar']
+  s.email       = ['jj@chef.io']
+  s.homepage    = 'https://github.com/chef/knife-openstack'
+  s.summary     = 'A Chef knife plugin for OpenStack clouds.'
+  s.description = 'A Chef knife plugin for OpenStack clouds.'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.add_dependency "fog", "~> 1.23"
-  s.add_dependency "chef", ">= 11"
-  s.add_dependency "knife-cloud", "~> 1.2.0"
+  s.add_dependency 'fog', '~> 1.23'
+  s.add_dependency 'chef', '>= 11'
+  s.add_dependency 'knife-cloud', '~> 1.2.0'
 
-  %w(rake rspec-core rspec-expectations rspec-mocks rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
+  %w(bundler rubocop rake rspec-core rspec-expectations rspec-mocks rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
 end

data/lib/chef/knife/cloud/openstack_server_create_options.rb

@@ -11,72 +11,72 @@ class Chef
 
             # Openstack Server create params.
             option :private_network,
-            :long => "--openstack-private-network",
-            :description => "Use the private IP for bootstrapping rather than the public IP",
-            :boolean => true,
-            :default => false
+                   long: '--openstack-private-network',
+                   description: 'Use the private IP for bootstrapping rather than the public IP',
+                   boolean: true,
+                   default: false
 
             option :openstack_floating_ip,
-            :short => "-a [IP]",
-            :long => "--openstack-floating-ip [IP]",
-            :default => "-1",
-            :description => "Request to associate a floating IP address to the new OpenStack node. Assumes IPs have been allocated to the project. Specific IP is optional."
+                   short: '-a [IP]',
+                   long: '--openstack-floating-ip [IP]',
+                   default: '-1',
+                   description: 'Request to associate a floating IP address to the new OpenStack node. Assumes IPs have been allocated to the project. Specific IP is optional.'
 
             option :openstack_volumes,
-            :long => "--openstack-volumes VOLUME1,VOLUME2,VOLUME3",
-            :description => "Comma separated list of the UUID(s) of the volume(s) to attach to the server",
-            :proc => Proc.new { |volumes| volumes.split(',') }
+                   long: '--openstack-volumes VOLUME1,VOLUME2,VOLUME3',
+                   description: 'Comma separated list of the UUID(s) of the volume(s) to attach to the server',
+                   proc: proc { |volumes| volumes.split(',') }
 
             option :openstack_scheduler_hints,
-            :long => "--scheduler-hints HINTS",
-            :description => "A scheduler group hint to OpenStack",
-            :proc => Proc.new { |i| Chef::Config[:knife][:openstack_scheduler_hints] = i }
+                   long: '--scheduler-hints HINTS',
+                   description: 'A scheduler group hint to OpenStack',
+                   proc: proc { |i| Chef::Config[:knife][:openstack_scheduler_hints] = i }
 
             option :openstack_security_groups,
-            :short => "-G X,Y,Z",
-            :long => "--openstack-groups X,Y,Z",
-            :description => "The security groups for this server",
-            :default => ["default"],
-            :proc => Proc.new { |groups| groups.split(',') }
+                   short: '-G X,Y,Z',
+                   long: '--openstack-groups X,Y,Z',
+                   description: 'The security groups for this server',
+                   default: ['default'],
+                   proc: proc { |groups| groups.split(',') }
 
             option :openstack_ssh_key_id,
-            :short => "-S KEY",
-            :long => "--openstack-ssh-key-id KEY",
-            :description => "The OpenStack SSH keypair id",
-            :proc => Proc.new { |key| Chef::Config[:knife][:openstack_ssh_key_id] = key }
+                   short: '-S KEY',
+                   long: '--openstack-ssh-key-id KEY',
+                   description: 'The OpenStack SSH keypair id',
+                   proc: proc { |key| Chef::Config[:knife][:openstack_ssh_key_id] = key }
 
             option :user_data,
-            :long => "--user-data USER_DATA",
-            :description => "The file path containing user data information for this server",
-            :proc => Proc.new { |user_data| open(user_data) { |f| f.read }  }
+                   long: '--user-data USER_DATA',
+                   description: 'The file path containing user data information for this server',
+                   proc: proc { |user_data| open(user_data, &:read) }
 
             option :bootstrap_network,
-            :long => '--bootstrap-network NAME',
-            :default => 'public',
-            :description => "Specify network for bootstrapping. Default is 'public'."
+                   long: '--bootstrap-network NAME',
+                   default: 'public',
+                   description: "Specify network for bootstrapping. Default is 'public'."
 
             option :network,
-            :long => "--no-network",
-            :boolean => true,
-            :default => true,
-            :description => "Use first available network for bootstrapping if 'public' and 'private' are unavailable."
+                   long: '--no-network',
+                   boolean: true,
+                   default: true,
+                   description: "Use first available network for bootstrapping if 'public' and 'private' are unavailable."
 
             option :network_ids,
-            :long => "--network-ids NETWORK_ID_1,NETWORK_ID_2,NETWORK_ID_3",
-            :description => "Comma separated list of the UUID(s) of the network(s) for the server to attach",
-            :proc => Proc.new { |networks| networks.split(',') }
+                   long: '--network-ids NETWORK_ID_1,NETWORK_ID_2,NETWORK_ID_3',
+                   description: 'Comma separated list of the UUID(s) of the network(s) for the server to attach',
+                   proc: proc { |networks| networks.split(',') }
 
             option :availability_zone,
-            :short => "-Z ZONE_NAME",
-            :long => "--availability-zone ZONE_NAME",
-            :description => "The availability zone for this server",
-            :proc => Proc.new { |z| Chef::Config[:knife][:availability_zone] = z }
+                   short: '-Z ZONE_NAME',
+                   long: '--availability-zone ZONE_NAME',
+                   description: 'The availability zone for this server',
+                   proc: proc { |z| Chef::Config[:knife][:availability_zone] = z }
 
             option :metadata,
-            :short => "-M X=1",
-            :long => "--metadata X=1",
-            :description => "Metadata information for this server (may pass multiple times)",
-            :proc => Proc.new { |data| Chef::Config[:knife][:metadata] ||= {}; Chef::Config[:knife][:metadata].merge!({data.split('=')[0]=>data.split('=')[1]})}
+                   short: '-M X=1',
+                   long: '--metadata X=1',
+                   description: 'Metadata information for this server (may pass multiple times)',
+                   proc: proc { |data| Chef::Config[:knife][:metadata] ||= {}; Chef::Config[:knife][:metadata].merge!(data.split('=')[0] => data.split('=')[1]) }
           end
         end
       end

data/lib/chef/knife/cloud/openstack_service.rb

@@ -10,53 +10,49 @@ class Chef
   class Knife
     class Cloud
       class OpenstackService < FogService
-
         def initialize(options = {})
           Chef::Log.debug("openstack_username #{Chef::Config[:knife][:openstack_username]}")
           Chef::Log.debug("openstack_auth_url #{Chef::Config[:knife][:openstack_auth_url]}")
           Chef::Log.debug("openstack_tenant #{Chef::Config[:knife][:openstack_tenant]}")
-          Chef::Log.debug("openstack_endpoint_type #{Chef::Config[:knife][:openstack_endpoint_type] || 'publicURL' }")
-          Chef::Log.debug("openstack_insecure #{Chef::Config[:knife][:openstack_insecure].to_s}")
-          Chef::Log.debug("openstack_region #{Chef::Config[:knife][:openstack_region].to_s}")
+          Chef::Log.debug("openstack_endpoint_type #{Chef::Config[:knife][:openstack_endpoint_type] || 'publicURL'}")
+          Chef::Log.debug("openstack_insecure #{Chef::Config[:knife][:openstack_insecure]}")
+          Chef::Log.debug("openstack_region #{Chef::Config[:knife][:openstack_region]}")
 
-          super(options.merge({
-                              :auth_params => {
-                                :provider => 'OpenStack',
-                                :openstack_username => Chef::Config[:knife][:openstack_username],
-                                :openstack_api_key => Chef::Config[:knife][:openstack_password],
-                                :openstack_auth_url => Chef::Config[:knife][:openstack_auth_url],
-                                :openstack_endpoint_type => Chef::Config[:knife][:openstack_endpoint_type],
-                                :openstack_tenant => Chef::Config[:knife][:openstack_tenant],
-                                :openstack_region => Chef::Config[:knife][:openstack_region],
-                                :connection_options => {
-                                  :ssl_verify_peer => !Chef::Config[:knife][:openstack_insecure]
+          super(options.merge(auth_params: {
+                                provider: 'OpenStack',
+                                openstack_username: Chef::Config[:knife][:openstack_username],
+                                openstack_api_key: Chef::Config[:knife][:openstack_password],
+                                openstack_auth_url: Chef::Config[:knife][:openstack_auth_url],
+                                openstack_endpoint_type: Chef::Config[:knife][:openstack_endpoint_type],
+                                openstack_tenant: Chef::Config[:knife][:openstack_tenant],
+                                openstack_region: Chef::Config[:knife][:openstack_region],
+                                connection_options: {
+                                  ssl_verify_peer: !Chef::Config[:knife][:openstack_insecure]
                                 }
-                }}))
+                              }))
         end
 
         # add alternate user defined api_endpoint value.
         def add_api_endpoint
-          @auth_params.merge!({:openstack_auth_url => Chef::Config[:knife][:api_endpoint]}) unless Chef::Config[:knife][:api_endpoint].nil?
+          @auth_params.merge!(openstack_auth_url: Chef::Config[:knife][:api_endpoint]) unless Chef::Config[:knife][:api_endpoint].nil?
         end
 
         def get_server(search_term)
-          begin
-            if server = connection.servers.get(search_term)
-              return server
-            end
+          if server = connection.servers.get(search_term)
+            return server
+          end
 
-            if servers = connection.servers.all(:name => search_term)
-              if servers.length > 1
-                error_message = "Multiple server matches found for '#{search_term}', use an instance_id to be more specific."
-                ui.fatal(error_message)
-                raise CloudExceptions::ValidationError, error_message
-              else
-                servers.first
-              end
+          if servers = connection.servers.all(name: search_term)
+            if servers.length > 1
+              error_message = "Multiple server matches found for '#{search_term}', use an instance_id to be more specific."
+              ui.fatal(error_message)
+              fail CloudExceptions::ValidationError, error_message
+            else
+              servers.first
             end
-          rescue Excon::Errors::BadRequest => e
-            handle_excon_exception(CloudExceptions::KnifeCloudError, e)
           end
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
       end
     end

data/lib/chef/knife/cloud/openstack_service_options.rb

@@ -3,47 +3,46 @@ class Chef
   class Knife
     class Cloud
       module OpenstackServiceOptions
-
-       def self.included(includer)
+        def self.included(includer)
           includer.class_eval do
             include FogOptions
             # Openstack Connection params.
             option :openstack_username,
-              :short => "-A USERNAME",
-              :long => "--openstack-username KEY",
-              :description => "Your OpenStack Username",
-              :proc => Proc.new { |key| Chef::Config[:knife][:openstack_username] = key }
+                   short: '-A USERNAME',
+                   long: '--openstack-username KEY',
+                   description: 'Your OpenStack Username',
+                   proc: proc { |key| Chef::Config[:knife][:openstack_username] = key }
 
             option :openstack_password,
-              :short => "-K SECRET",
-              :long => "--openstack-password SECRET",
-              :description => "Your OpenStack Password",
-              :proc => Proc.new { |key| Chef::Config[:knife][:openstack_password] = key }
+                   short: '-K SECRET',
+                   long: '--openstack-password SECRET',
+                   description: 'Your OpenStack Password',
+                   proc: proc { |key| Chef::Config[:knife][:openstack_password] = key }
 
             option :openstack_tenant,
-              :short => "-T NAME",
-              :long => "--openstack-tenant NAME",
-              :description => "Your OpenStack Tenant NAME",
-              :proc => Proc.new { |key| Chef::Config[:knife][:openstack_tenant] = key }
+                   short: '-T NAME',
+                   long: '--openstack-tenant NAME',
+                   description: 'Your OpenStack Tenant NAME',
+                   proc: proc { |key| Chef::Config[:knife][:openstack_tenant] = key }
 
             option :openstack_auth_url,
-              :long => "--openstack-api-endpoint ENDPOINT",
-              :description => "Your OpenStack API endpoint",
-              :proc => Proc.new { |endpoint| Chef::Config[:knife][:openstack_auth_url] = endpoint }
+                   long: '--openstack-api-endpoint ENDPOINT',
+                   description: 'Your OpenStack API endpoint',
+                   proc: proc { |endpoint| Chef::Config[:knife][:openstack_auth_url] = endpoint }
 
             option :openstack_endpoint_type,
-              :long => "--openstack-endpoint-type ENDPOINT_TYPE",
-              :description => "OpenStack endpoint type to use (publicURL, internalURL, adminURL)",
-              :proc => Proc.new { |type| Chef::Config[:knife][:openstack_endpoint_type] = type }
+                   long: '--openstack-endpoint-type ENDPOINT_TYPE',
+                   description: 'OpenStack endpoint type to use (publicURL, internalURL, adminURL)',
+                   proc: proc { |type| Chef::Config[:knife][:openstack_endpoint_type] = type }
 
             option :openstack_insecure,
-              :long => "--insecure",
-              :description => "Ignore SSL certificate on the Auth URL",
-              :boolean => true,
-              :default => false,
-              :proc => Proc.new { |key| Chef::Config[:knife][:openstack_insecure] = key }
+                   long: '--insecure',
+                   description: 'Ignore SSL certificate on the Auth URL',
+                   boolean: true,
+                   default: false,
+                   proc: proc { |key| Chef::Config[:knife][:openstack_insecure] = key }
           end
-        end
+         end
       end
     end
   end

data/lib/chef/knife/openstack_flavor_list.rb

@@ -12,18 +12,18 @@ class Chef
         include OpenstackHelpers
         include OpenstackServiceOptions
 
-        banner "knife openstack flavor list (options)"
+        banner 'knife openstack flavor list (options)'
 
         def before_exec_command
-          #set columns_with_info map
+          # set columns_with_info map
           @columns_with_info = [
-            {:label => 'Name', :key => 'name'},
-            {:label => 'ID', :key => 'id'},
-            {:label => 'Virtual CPUs', :key => 'vcpus'},
-            {:label => 'RAM', :key => 'ram', :value_callback => method(:ram_in_mb)},
-            {:label => 'Disk', :key => 'disk', :value_callback => method(:disk_in_gb)}
+            { label: 'Name', key: 'name' },
+            { label: 'ID', key: 'id' },
+            { label: 'Virtual CPUs', key: 'vcpus' },
+            { label: 'RAM', key: 'ram', value_callback: method(:ram_in_mb) },
+            { label: 'Disk', key: 'disk', value_callback: method(:disk_in_gb) }
           ]
-          @sort_by_field = "name"
+          @sort_by_field = 'name'
         end
 
         def query_resource
@@ -37,8 +37,7 @@ class Chef
         def disk_in_gb(disk)
           "#{disk} GB"
         end
-
       end
     end
   end
-end
+end

data/lib/chef/knife/openstack_floating_ip_allocate.rb

@@ -15,10 +15,10 @@ class Chef
         banner 'knife openstack floating_ip allocate (options)'
 
         option :pool,
-          :short => '-p POOL',
-          :long => '--pool POOL',
-          :description => 'Floating IP pool to allocate from.',
-          :proc => Proc.new { |key| Chef::Config[:knife][:pool] = key }
+               short: '-p POOL',
+               long: '--pool POOL',
+               description: 'Floating IP pool to allocate from.',
+               proc: proc { |key| Chef::Config[:knife][:pool] = key }
 
         def execute_command
           @resource = @service.allocate_address(locate_config_value(:pool))

data/lib/chef/knife/openstack_floating_ip_associate.rb

@@ -16,16 +16,16 @@ class Chef
         banner 'knife openstack floating_ip associate IP (options)'
 
         option :instance_id,
-          :long => '--instance-id ID',
-          :description => 'Instance id to associate it with.',
-          :proc => Proc.new { |key| Chef::Config[:knife][:instance_id] = key },
-          :required => true
+               long: '--instance-id ID',
+               description: 'Instance id to associate it with.',
+               proc: proc { |key| Chef::Config[:knife][:instance_id] = key },
+               required: true
 
         def execute_command
           if @name_args[0]
             floating_ip = @name_args[0]
           else
-            ui.error "Please provide Floating IP to associate with."
+            ui.error 'Please provide Floating IP to associate with.'
             exit 1
           end