knife-openstack 1.3.2 → 2.0.0

data/lib/chef/knife/openstack_server_delete.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
 #
 # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Copyright:: Copyright (c) 2013 Chef Software, Inc.
 #
 
-require 'chef/knife/cloud/server/delete_options'
-require 'chef/knife/cloud/server/delete_command'
-require 'chef/knife/cloud/openstack_service'
-require 'chef/knife/cloud/openstack_service_options'
-require 'chef/knife/openstack_helpers'
+require "chef/knife/cloud/server/delete_options"
+require "chef/knife/cloud/server/delete_command"
+require "chef/knife/cloud/openstack_service"
+require "chef/knife/cloud/openstack_service_options"
+require "chef/knife/openstack_helpers"
 
 class Chef
   class Knife
@@ -18,7 +19,7 @@ class Chef
         include OpenstackServiceOptions
         include OpenstackHelpers
 
-        banner 'knife openstack server delete INSTANCEID [INSTANCEID] (options)'
+        banner "knife openstack server delete INSTANCEID [INSTANCEID] (options)"
       end
     end
   end

data/lib/chef/knife/openstack_server_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Seth Chisamore (<schisamo@getchef.com>)
 # Author:: Matt Ray (<matt@getchef.com>)
@@ -19,10 +20,10 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/server/list_command'
-require 'chef/knife/openstack_helpers'
-require 'chef/knife/cloud/openstack_service_options'
-require 'chef/knife/cloud/server/list_options'
+require "chef/knife/cloud/server/list_command"
+require "chef/knife/openstack_helpers"
+require "chef/knife/cloud/openstack_service_options"
+require "chef/knife/cloud/server/list_options"
 
 class Chef
   class Knife
@@ -32,21 +33,21 @@ 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
           @columns_with_info = [
-            { 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' }
+            { 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
 
@@ -55,7 +56,7 @@ class Chef
         end
 
         def get_id(value)
-          value['id']
+          value["id"]
         end
       end
     end

data/lib/chef/knife/openstack_server_show.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) 2011-2013 Chef Software, Inc.
 # License:: Apache License, Version 2.0
@@ -15,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/server/show_command'
-require 'chef/knife/openstack_helpers'
-require 'chef/knife/cloud/server/show_options'
-require 'chef/knife/cloud/openstack_service'
-require 'chef/knife/cloud/openstack_service_options'
-require 'chef/knife/cloud/exceptions'
+require "chef/knife/cloud/server/show_command"
+require "chef/knife/openstack_helpers"
+require "chef/knife/cloud/server/show_options"
+require "chef/knife/cloud/openstack_service"
+require "chef/knife/cloud/openstack_service_options"
+require "chef/knife/cloud/exceptions"
 
 class Chef
   class Knife
@@ -30,25 +31,25 @@ 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
           @columns_with_info = [
-            { 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' }
+            { 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
 
         def get_id(value)
-          value['id']
+          value["id"]
         end
       end
     end

data/lib/chef/knife/openstack_volume_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Seth Chisamore (<schisamo@getchef.com>)
 # Author:: Matt Ray (<matt@getchef.com>)
@@ -18,9 +19,9 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/list_resource_command'
-require 'chef/knife/openstack_helpers'
-require 'chef/knife/cloud/openstack_service_options'
+require "chef/knife/cloud/list_resource_command"
+require "chef/knife/openstack_helpers"
+require "chef/knife/cloud/openstack_service_options"
 
 class Chef
   class Knife
@@ -29,7 +30,7 @@ class Chef
         include OpenstackHelpers
         include OpenstackServiceOptions
 
-        banner 'knife openstack volume list (options)'
+        banner "knife openstack volume list (options)"
 
         def query_resource
           @service.connection.volumes
@@ -41,11 +42,11 @@ class Chef
 
         def list(volumes)
           volume_list = [
-            ui.color('Name', :bold),
-            ui.color('ID', :bold),
-            ui.color('Status', :bold),
-            ui.color('Size', :bold),
-            ui.color('Description', :bold)
+            ui.color("Name", :bold),
+            ui.color("ID", :bold),
+            ui.color("Status", :bold),
+            ui.color("Size", :bold),
+            ui.color("Description", :bold),
           ]
           begin
             volumes.sort_by(&:name).each do |volume|

data/lib/knife-openstack/version.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Knife
   module OpenStack
-    VERSION = '1.3.2'
-    MAJOR, MINOR, TINY = VERSION.split('.')
+    VERSION = "2.0.0"
+    MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/spec/functional/flavor_list_func_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
 # Author:: Ameya Varade (<ameya.varade@clogeny.com>)
@@ -16,30 +17,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'spec_helper'
-require 'chef/knife/openstack_flavor_list'
-require 'chef/knife/cloud/openstack_service'
-require 'support/shared_examples_for_command'
+require "spec_helper"
+require "chef/knife/openstack_flavor_list"
+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 }
 
-  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: 16_384, 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

data/spec/functional/floating_ip_list_func_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
 # Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
@@ -15,32 +16,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'spec_helper'
-require 'chef/knife/openstack_floating_ip_list'
-require 'chef/knife/cloud/openstack_service'
-require 'support/shared_examples_for_command'
+require "spec_helper"
+require "chef/knife/openstack_floating_ip_list"
+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 }
 
-  context 'functionality' do
+  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'
+      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"
                                    ),
-                   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
-      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)
+    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)
       instance.run
     end
   end

data/spec/functional/group_list_func_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
@@ -17,47 +18,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'spec_helper'
-require 'chef/knife/openstack_group_list'
-require 'chef/knife/cloud/openstack_service'
+require "spec_helper"
+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 }
 
-  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)
+      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),
                                                               ]),
-                   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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
 # Author:: Ameya Varade (<ameya.varade@clogeny.com>)
@@ -16,36 +17,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'spec_helper'
-require 'chef/knife/openstack_image_list'
-require 'chef/knife/cloud/openstack_service'
+require "spec_helper"
+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 }
 
-  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

data/spec/functional/network_list_func_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Ameya Varade (<ameya.varade@clogeny.com>)
 # Copyright:: Copyright (c) 2014 Chef Software, Inc.
@@ -15,30 +16,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'spec_helper'
-require 'chef/knife/openstack_network_list'
-require 'chef/knife/cloud/openstack_service'
-require 'support/shared_examples_for_command'
+require "spec_helper"
+require "chef/knife/openstack_network_list"
+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 }
 
-  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