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

data/lib/chef/knife/openstack_server_list.rb

@@ -32,37 +32,31 @@ class Chef
         include OpenstackServiceOptions
         include ServerListOptions
 
-        banner "knife openstack server list (options)"
+        banner 'knife openstack server list (options)'
 
         def before_exec_command
-          #set columns_with_info map
+          # set columns_with_info map
           @columns_with_info = [
-            {:label => 'Name', :key => 'name'},
-            {:label => 'Instance ID', :key => 'id'},
-            {:label => 'Public IP', :key => 'addresses', :value_callback => method(:get_public_ip_address)},
-            {:label => 'Private IP', :key => 'addresses', :value_callback => method(:get_private_ip_address)},
-            {:label => 'Flavor', :key => 'flavor', :value_callback => method(:get_id)},
-            {:label => 'Image', :key => 'image', :value_callback => method(:get_id)},
-            {:label => 'Keypair', :key => 'key_name'},
-            {:label => 'State', :key => 'state'},
-            {:label => 'Availability Zone', :key => 'availability_zone'}
+            { label: 'Name', key: 'name' },
+            { label: 'Instance ID', key: 'id' },
+            { label: 'Addresses', key: 'addresses', value_callback: method(:addresses) },
+            { label: 'Flavor', key: 'flavor', value_callback: method(:get_id) },
+            { label: 'Image', key: 'image', value_callback: method(:get_id) },
+            { label: 'Keypair', key: 'key_name' },
+            { label: 'State', key: 'state' },
+            { label: 'Availability Zone', key: 'availability_zone' }
           ]
-          @sort_by_field = "name"
+          @sort_by_field = 'name'
           super
         end
 
-        def get_public_ip_address (addresses)
-          primary_public_ip_address(addresses)
-        end
-
-        def get_private_ip_address (addresses)
-          primary_private_ip_address(addresses)
+        def addresses(addresses)
+          instance_addresses(addresses)
         end
 
         def get_id(value)
           value['id']
         end
-
       end
     end
   end

data/lib/chef/knife/openstack_server_show.rb

@@ -30,21 +30,20 @@ class Chef
         include OpenstackServiceOptions
         include ServerShowOptions
 
-        banner "knife openstack server show (options)"
+        banner 'knife openstack server show (options)'
 
         def before_exec_command
-          #set columns_with_info map
+          # set columns_with_info map
           @columns_with_info = [
-          {:label => 'Instance ID', :key => 'id'},
-          {:label => 'Name', :key => 'name'},
-          {:label => 'Public IP', :key => 'addresses', :value_callback => method(:primary_public_ip_address)},
-          {:label => 'Private IP', :key => 'addresses', :value_callback => method(:primary_private_ip_address)},
-          {:label => 'Flavor', :key => 'flavor', :value_callback => method(:get_id)},
-          {:label => 'Image', :key => 'image', :value_callback => method(:get_id)},
-          {:label => 'Keypair', :key => 'key_name'},
-          {:label => 'State', :key => 'state'},
-          {:label => 'Availability Zone', :key => 'availability_zone'}
-        ]
+            { label: 'Instance ID', key: 'id' },
+            { label: 'Name', key: 'name' },
+            { label: 'Addresses', key: 'addresses', value_callback: method(:instance_addresses) },
+            { label: 'Flavor', key: 'flavor', value_callback: method(:get_id) },
+            { label: 'Image', key: 'image', value_callback: method(:get_id) },
+            { label: 'Keypair', key: 'key_name' },
+            { label: 'State', key: 'state' },
+            { label: 'Availability Zone', key: 'availability_zone' }
+          ]
           super
         end
 

data/lib/chef/knife/openstack_volume_list.rb

@@ -26,19 +26,17 @@ class Chef
   class Knife
     class Cloud
       class OpenstackVolumeList < ResourceListCommand
-          include OpenstackHelpers
-          include OpenstackServiceOptions
+        include OpenstackHelpers
+        include OpenstackServiceOptions
 
-        banner "knife openstack volume list (options)"
+        banner 'knife openstack volume list (options)'
 
         def query_resource
-          begin
-            @service.connection.volumes
-          rescue Excon::Errors::BadRequest => e
-            response = Chef::JSONCompat.from_json(e.response.body)
-            ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
-            raise e
-          end
+          @service.connection.volumes
+        rescue Excon::Errors::BadRequest => e
+          response = Chef::JSONCompat.from_json(e.response.body)
+          ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+          raise e
         end
 
         def list(volumes)
@@ -47,14 +45,14 @@ class Chef
             ui.color('ID', :bold),
             ui.color('Status', :bold),
             ui.color('Size', :bold),
-            ui.color('Description', :bold),
+            ui.color('Description', :bold)
           ]
           begin
             volumes.sort_by(&:name).each do |volume|
               volume_list << volume.name
               volume_list << volume.id.to_s
               volume_list << volume.status
-              volume_list << "#{volume.size.to_s} GB"
+              volume_list << "#{volume.size} GB"
               volume_list << volume.description
             end
           rescue Excon::Errors::BadRequest => e

data/lib/knife-openstack/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module OpenStack
-    VERSION = "1.3.2.pre"
+    VERSION = '1.3.2.pre.1'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/functional/flavor_list_func_spec.rb

@@ -22,25 +22,25 @@ require 'chef/knife/cloud/openstack_service'
 require 'support/shared_examples_for_command'
 
 describe Chef::Knife::Cloud::OpenstackFlavorList do
-  let (:instance) {Chef::Knife::Cloud::OpenstackFlavorList.new}
+  let (:instance) { Chef::Knife::Cloud::OpenstackFlavorList.new }
 
-  context "functionality" do
+  context 'functionality' do
     before do
-      resources = [ TestResource.new({:id => "resource-1", :name => "m1.tiny", :vcpus => "1", :ram => 512, :disk => 0}),
-                     TestResource.new({:id => "resource-2", :name => "m1-xlarge-bigdisk", :vcpus => "8", :ram => 16384, :disk => 50})
-                   ]
+      resources = [TestResource.new(id: 'resource-1', name: 'm1.tiny', vcpus: '1', ram: 512, disk: 0),
+                   TestResource.new(id: 'resource-2', name: 'm1-xlarge-bigdisk', vcpus: '8', ram: 16_384, disk: 50)
+                  ]
       allow(instance).to receive(:query_resource).and_return(resources)
       allow(instance).to receive(:puts)
       allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
       allow(instance).to receive(:validate!)
-      instance.config[:format] = "summary"
+      instance.config[:format] = 'summary'
     end
 
-    it "lists formatted list of resources" do
-      expect(instance.ui).to receive(:list).with(["Name", "ID", "Virtual CPUs", "RAM", "Disk",
-                                              "m1-xlarge-bigdisk", "resource-2", "8", "16384 MB", "50 GB",
-                                              "m1.tiny", "resource-1", "1", "512 MB", "0 GB"], :uneven_columns_across, 5)
+    it 'lists formatted list of resources' do
+      expect(instance.ui).to receive(:list).with(['Name', 'ID', 'Virtual CPUs', 'RAM', 'Disk',
+                                                  'm1-xlarge-bigdisk', 'resource-2', '8', '16384 MB', '50 GB',
+                                                  'm1.tiny', 'resource-1', '1', '512 MB', '0 GB'], :uneven_columns_across, 5)
       instance.run
     end
   end
-end
+end

data/spec/functional/floating_ip_list_func_spec.rb

@@ -21,27 +21,27 @@ require 'chef/knife/cloud/openstack_service'
 require 'support/shared_examples_for_command'
 
 describe Chef::Knife::Cloud::OpenstackFloatingIpList do
-  let (:instance) {Chef::Knife::Cloud::OpenstackFloatingIpList.new}
+  let (:instance) { Chef::Knife::Cloud::OpenstackFloatingIpList.new }
 
   context 'functionality' do
     before do
-      resources = [ TestResource.new({ "id" => "floatingip1", "instance_id" => "daed9e86-4b69-4242-993a-926a39352783", "ip" => "173.236.251.98", "fixed_ip" => "", "pool" => "test-pool"}
-),
-                    TestResource.new({ "id" => "floatingip2", "instance_id" => "", "ip" => "67.205.60.122", "fixed_ip" => "10.10.10.1", "pool" => "test-pool" }
-)
-                   ]
+      resources = [TestResource.new('id' => 'floatingip1', 'instance_id' => 'daed9e86-4b69-4242-993a-926a39352783', 'ip' => '173.236.251.98', 'fixed_ip' => '', 'pool' => 'test-pool'
+                                   ),
+                   TestResource.new('id' => 'floatingip2', 'instance_id' => '', 'ip' => '67.205.60.122', 'fixed_ip' => '10.10.10.1', 'pool' => 'test-pool'
+                                   )
+                  ]
       allow(instance).to receive(:query_resource).and_return(resources)
       allow(instance).to receive(:puts)
       allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
       allow(instance).to receive(:validate!)
-      instance.config[:format] = "summary"
+      instance.config[:format] = 'summary'
     end
 
-    it "lists formatted list of resources" do
+    it 'lists formatted list of resources' do
       expect(instance.ui).to receive(:list).with(['ID', 'Instance ID', 'IP Address', 'Fixed IP', 'Floating IP Pool',
-                                             'floatingip1', 'daed9e86-4b69-4242-993a-926a39352783', '173.236.251.98', '', 'test-pool',
-                                             'floatingip2','', '67.205.60.122', '10.10.10.1', 'test-pool'], :uneven_columns_across, 5)
+                                                  'floatingip1', 'daed9e86-4b69-4242-993a-926a39352783', '173.236.251.98', '', 'test-pool',
+                                                  'floatingip2', '', '67.205.60.122', '10.10.10.1', 'test-pool'], :uneven_columns_across, 5)
       instance.run
     end
   end
-end
+end

data/spec/functional/group_list_func_spec.rb

@@ -22,46 +22,42 @@ require 'chef/knife/openstack_group_list'
 require 'chef/knife/cloud/openstack_service'
 
 describe Chef::Knife::Cloud::OpenstackGroupList do
-  let (:instance) {Chef::Knife::Cloud::OpenstackGroupList.new}
+  let (:instance) { Chef::Knife::Cloud::OpenstackGroupList.new }
 
-  context "functionality" do
+  context 'functionality' do
     before do
-      resources = [ TestResource.new({ "name" => "Unrestricted",
-                                      "description" => "All ports open",
-                                      "security_group_rules" => [TestResource.new({"from_port" => 1,
-                                                                                   "group" => {},
-                                                                                   "ip_protocol" => "tcp",
-                                                                                   "to_port" => 636,
-                                                                                   "parent_group_id" => 14,
-                                                                                   "ip_range" => {"cidr" => "0.0.0.0/0"},
-                                                                                   "id" => 1
-                                                                                   })
-                                                                ]
-                                    }),
-                    TestResource.new({ "name" => "WindowsDomain",
-                                      "description" => "Allows common protocols useful in a Windows domain",
-                                      "security_group_rules" => [TestResource.new({"from_port" => 22,
-                                                                                   "group" => {},
-                                                                                   "ip_protocol" => "tcp",
-                                                                                   "to_port" => 636,
-                                                                                   "parent_group_id" => 14,
-                                                                                   "ip_range" => {"cidr" => "0.0.0.0/0"},
-                                                                                   "id" => 2
-                                                                                   })
-                                                                ]
-                                    })
+      resources = [TestResource.new('name' => 'Unrestricted',
+                                    'description' => 'All ports open',
+                                    'security_group_rules' => [TestResource.new('from_port' => 1,
+                                                                                'group' => {},
+                                                                                'ip_protocol' => 'tcp',
+                                                                                'to_port' => 636,
+                                                                                'parent_group_id' => 14,
+                                                                                'ip_range' => { 'cidr' => '0.0.0.0/0' },
+                                                                                'id' => 1)
+                                                              ]),
+                   TestResource.new('name' => 'WindowsDomain',
+                                    'description' => 'Allows common protocols useful in a Windows domain',
+                                    'security_group_rules' => [TestResource.new('from_port' => 22,
+                                                                                'group' => {},
+                                                                                'ip_protocol' => 'tcp',
+                                                                                'to_port' => 636,
+                                                                                'parent_group_id' => 14,
+                                                                                'ip_range' => { 'cidr' => '0.0.0.0/0' },
+                                                                                'id' => 2)
+                                                              ])
                   ]
       allow(instance).to receive(:query_resource).and_return(resources)
       allow(instance).to receive(:puts)
       allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
       allow(instance).to receive(:validate!)
-      instance.config[:format] = "summary"
+      instance.config[:format] = 'summary'
     end
 
-    it "lists formatted list of resources" do
-      expect(instance.ui).to receive(:list).with(["Name", "Protocol", "From", "To", "CIDR", "Description",
-                                              "Unrestricted", "tcp", "1", "636", "0.0.0.0/0", "All ports open",
-                                              "WindowsDomain", "tcp", "22", "636", "0.0.0.0/0", "Allows common protocols useful in a Windows domain"], :uneven_columns_across, 6)
+    it 'lists formatted list of resources' do
+      expect(instance.ui).to receive(:list).with(['Name', 'Protocol', 'From', 'To', 'CIDR', 'Description',
+                                                  'Unrestricted', 'tcp', '1', '636', '0.0.0.0/0', 'All ports open',
+                                                  'WindowsDomain', 'tcp', '22', '636', '0.0.0.0/0', 'Allows common protocols useful in a Windows domain'], :uneven_columns_across, 6)
       instance.run
     end
   end

data/spec/functional/image_list_func_spec.rb

@@ -21,32 +21,32 @@ require 'chef/knife/openstack_image_list'
 require 'chef/knife/cloud/openstack_service'
 
 describe Chef::Knife::Cloud::OpenstackImageList do
-  let (:instance) {Chef::Knife::Cloud::OpenstackImageList.new}
+  let (:instance) { Chef::Knife::Cloud::OpenstackImageList.new }
 
-  context "functionality" do
+  context 'functionality' do
     before do
-      resources = [ TestResource.new({:id => "resource-1", :name => "image01", :metadata => {} }),
-                     TestResource.new({:id => "resource-2", :name => "initrd", :metadata => {} })
-                   ]
+      resources = [TestResource.new(id: 'resource-1', name: 'image01', metadata: {}),
+                   TestResource.new(id: 'resource-2', name: 'initrd', metadata: {})
+                  ]
       allow(instance).to receive(:query_resource).and_return(resources)
       allow(instance).to receive(:puts)
       allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
       allow(instance).to receive(:validate!)
-      instance.config[:format] = "summary"
+      instance.config[:format] = 'summary'
     end
 
-    it "displays formatted list of images, filtered by default" do
-      expect(instance.ui).to receive(:list).with(["Name", "ID", "Snapshot",
-                                              "image01", "resource-1", "no"], :uneven_columns_across, 3)
+    it 'displays formatted list of images, filtered by default' do
+      expect(instance.ui).to receive(:list).with(['Name', 'ID', 'Snapshot',
+                                                  'image01', 'resource-1', 'no'], :uneven_columns_across, 3)
       instance.run
     end
 
-    it "lists all images when disable_filter = true" do
+    it 'lists all images when disable_filter = true' do
       instance.config[:disable_filter] = true
-      expect(instance.ui).to receive(:list).with(["Name", "ID", "Snapshot",
-                                              "image01", "resource-1", "no",
-                                              "initrd", "resource-2", "no"], :uneven_columns_across, 3)
+      expect(instance.ui).to receive(:list).with(['Name', 'ID', 'Snapshot',
+                                                  'image01', 'resource-1', 'no',
+                                                  'initrd', 'resource-2', 'no'], :uneven_columns_across, 3)
       instance.run
     end
   end
-end
+end

data/spec/functional/network_list_func_spec.rb

@@ -21,25 +21,25 @@ require 'chef/knife/cloud/openstack_service'
 require 'support/shared_examples_for_command'
 
 describe Chef::Knife::Cloud::OpenstackNetworkList do
-  let (:instance) {Chef::Knife::Cloud::OpenstackNetworkList.new}
+  let (:instance) { Chef::Knife::Cloud::OpenstackNetworkList.new }
 
-  context "functionality" do
+  context 'functionality' do
     before do
-      resources = [ TestResource.new({:id => "resource-1", :name => "external", :tenant_id => "1", :shared => true}),
-                    TestResource.new({:id => "resource-2", :name => "internal", :tenant_id => "2", :shared => false})
+      resources = [TestResource.new(id: 'resource-1', name: 'external', tenant_id: '1', shared: true),
+                   TestResource.new(id: 'resource-2', name: 'internal', tenant_id: '2', shared: false)
                   ]
       allow(instance).to receive(:query_resource).and_return(resources)
       allow(instance).to receive(:puts)
       allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
       allow(instance).to receive(:validate!)
-      instance.config[:format] = "summary"
+      instance.config[:format] = 'summary'
     end
 
-    it "lists formatted list of network resources" do
-      expect(instance.ui).to receive(:list).with(["Name", "ID", "Tenant", "Shared",
-                                              "external", "resource-1", "1", "true",
-                                              "internal", "resource-2", "2", "false"], :uneven_columns_across, 4)
+    it 'lists formatted list of network resources' do
+      expect(instance.ui).to receive(:list).with(['Name', 'ID', 'Tenant', 'Shared',
+                                                  'external', 'resource-1', '1', 'true',
+                                                  'internal', 'resource-2', '2', 'false'], :uneven_columns_across, 4)
       instance.run
     end
   end
-end
+end

data/spec/functional/server_create_func_spec.rb

@@ -22,15 +22,14 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe Chef::Knife::Cloud::OpenstackServerCreate do
-
   before do
     @knife_openstack_create = Chef::Knife::Cloud::OpenstackServerCreate.new
     {
-      :image => 'image',
-      :openstack_username => 'openstack_username',
-      :openstack_password => 'openstack_password',
-      :openstack_auth_url => 'openstack_auth_url',
-      :server_create_timeout => 1000
+      image: 'image',
+      openstack_username: 'openstack_username',
+      openstack_password: 'openstack_password',
+      openstack_auth_url: 'openstack_auth_url',
+      server_create_timeout: 1000
     }.each do |key, value|
       Chef::Config[:knife][key] = value
     end
@@ -47,18 +46,18 @@ describe Chef::Knife::Cloud::OpenstackServerCreate do
 
     allow(@knife_openstack_create).to receive(:create_service_instance).and_return(@openstack_service)
     allow(@knife_openstack_create).to receive(:puts)
-    @new_openstack_server = double()
+    @new_openstack_server = double
 
-    @openstack_server_attribs = { :name => 'Mock Server',
-                                  :id => 'id-123456',
-                                  :key_name => 'key_name',
-                                  :flavor => 'flavor_id',
-                                  :image => 'image_id',
-                                  :addresses => {
-                                    'public' => [{'addr' => '75.101.253.10'}],
-                                    'private' => [{'addr' => '10.251.75.20'}]
-                                    },
-                                  :password => 'password'
+    @openstack_server_attribs = { name: 'Mock Server',
+                                  id: 'id-123456',
+                                  key_name: 'key_name',
+                                  flavor: 'flavor_id',
+                                  image: 'image_id',
+                                  addresses: {
+                                    'public' => [{ 'addr' => '75.101.253.10' }],
+                                    'private' => [{ 'addr' => '10.251.75.20' }]
+                                  },
+                                  password: 'password'
                                 }
 
     @openstack_server_attribs.each_pair do |attrib, value|
@@ -66,7 +65,7 @@ describe Chef::Knife::Cloud::OpenstackServerCreate do
     end
   end
 
-  describe "run" do
+  describe 'run' do
     before(:each) do
       allow(@knife_openstack_create).to receive(:validate_params!)
       allow(Fog::Compute::OpenStack).to receive_message_chain(:new, :servers, :create).and_return(@new_openstack_server)
@@ -74,9 +73,9 @@ describe Chef::Knife::Cloud::OpenstackServerCreate do
       allow(@new_openstack_server).to receive(:wait_for)
     end
 
-    context "for Linux" do
+    context 'for Linux' do
       before do
-        @config = {:openstack_floating_ip=>"-1", :bootstrap_ip_address => "75.101.253.10", :ssh_password=>"password"}
+        @config = { openstack_floating_ip: '-1', bootstrap_ip_address: '75.101.253.10', ssh_password: 'password' }
         @knife_openstack_create.config[:distro] = 'chef-full'
         @bootstrapper = Chef::Knife::Cloud::Bootstrapper.new(@config)
         @ssh_bootstrap_protocol = Chef::Knife::Cloud::SshBootstrapProtocol.new(@config)
@@ -84,7 +83,7 @@ describe Chef::Knife::Cloud::OpenstackServerCreate do
         allow(@ssh_bootstrap_protocol).to receive(:send_bootstrap_command)
       end
 
-      it "Creates an OpenStack instance and bootstraps it" do
+      it 'Creates an OpenStack instance and bootstraps it' do
         expect(Chef::Knife::Cloud::Bootstrapper).to receive(:new).with(@config).and_return(@bootstrapper)
         allow(@bootstrapper).to receive(:bootstrap).and_call_original
         expect(@bootstrapper).to receive(:create_bootstrap_protocol).and_return(@ssh_bootstrap_protocol)
@@ -94,9 +93,9 @@ describe Chef::Knife::Cloud::OpenstackServerCreate do
       end
     end
 
-    context "for Windows" do
+    context 'for Windows' do
       before do
-        @config = {:openstack_floating_ip=>"-1", :image_os_type => 'windows', :bootstrap_ip_address => "75.101.253.10", :bootstrap_protocol => 'winrm', :ssh_password=>"password"}
+        @config = { openstack_floating_ip: '-1', image_os_type: 'windows', bootstrap_ip_address: '75.101.253.10', bootstrap_protocol: 'winrm', ssh_password: 'password' }
         @knife_openstack_create.config[:image_os_type] = 'windows'
         @knife_openstack_create.config[:bootstrap_protocol] = 'winrm'
         @knife_openstack_create.config[:distro] = 'windows-chef-client-msi'
@@ -104,7 +103,7 @@ describe Chef::Knife::Cloud::OpenstackServerCreate do
         @winrm_bootstrap_protocol = Chef::Knife::Cloud::WinrmBootstrapProtocol.new(@config)
         @windows_distribution = Chef::Knife::Cloud::WindowsDistribution.new(@config)
       end
-      it "Creates an OpenStack instance for Windows and bootstraps it" do
+      it 'Creates an OpenStack instance for Windows and bootstraps it' do
         expect(Chef::Knife::Cloud::Bootstrapper).to receive(:new).with(@config).and_return(@bootstrapper)
         allow(@bootstrapper).to receive(:bootstrap).and_call_original
         expect(@bootstrapper).to receive(:create_bootstrap_protocol).and_return(@winrm_bootstrap_protocol)