knife-openstack 0.10.0 → 1.0.0.rc1

data/lib/chef/knife/openstack_server_delete.rb

@@ -1,106 +1,26 @@
-#
-# Author:: Seth Chisamore (<schisamo@getchef.com>)
-# Author:: Matt Ray (<matt@getchef.com>)
-# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
-# 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.
-#
-
-require 'chef/knife/openstack_base'
-
-# These two are needed for the '--purge' deletion case
-require 'chef/node'
-require 'chef/api_client'
-
-class Chef
-  class Knife
-    class OpenstackServerDelete < Knife
-
-      include Knife::OpenstackBase
-
-      banner "knife openstack server delete SERVER [SERVER] (options)"
-
-      option :purge,
-        :short => "-P",
-        :long => "--purge",
-        :boolean => true,
-        :default => false,
-        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the OpenStack node itself. Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
-
-      option :chef_node_name,
-        :short => "-N NAME",
-        :long => "--node-name NAME",
-        :description => "The name of the node and client to delete, if it differs from the server name. Only has meaning when used with the '--purge' option."
-
-      # Extracted from Chef::Knife.delete_object, because it has a
-      # confirmation step built in... By specifying the '--purge'
-      # flag (and also explicitly confirming the server destruction!)
-      # the user is already making their intent known.  It is not
-      # necessary to make them confirm two more times.
-      def destroy_item(klass, name, type_name)
-        begin
-          object = klass.load(name)
-          object.destroy
-          ui.warn("Deleted #{type_name} #{name}")
-        rescue Net::HTTPServerException
-          ui.warn("Could not find a #{type_name} named #{name} to delete!")
-        end
-      end
-
-      def run
-
-        validate!
-
-        @name_args.each do |instance_id|
-          begin
-            server = connection.servers.find{|s| s.name == instance_id || s.id == instance_id }
-
-            msg_pair("Instance Name", server.name)
-            msg_pair("Instance ID", server.id)
-            msg_pair("Flavor", server.flavor['id'])
-            msg_pair("Image", server.image['id'])
-            server.addresses.each do |name,addr|
-              msg_pair("Network", name)
-              msg_pair("  IP Address", addr[0]['addr'])
-            end
-            msg_pair("Availability Zone", server.availability_zone)
-
-            puts "\n"
-            confirm("Do you really want to delete this server")
-
-            server.destroy
-
-            ui.warn("Deleted server #{server.id}")
-
-            if config[:purge]
-              thing_to_delete = config[:chef_node_name] || instance_id
-              destroy_item(Chef::Node, thing_to_delete, "node")
-              destroy_item(Chef::ApiClient, thing_to_delete, "client")
-            else
-              ui.warn("Corresponding node and client for the #{instance_id} server were not deleted and remain registered with the Chef Server")
-            end
-
-          rescue NoMethodError
-            ui.error("Could not locate server '#{instance_id}'.")
-          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
-        end
-      end
-
-    end
-  end
-end
+#
+# 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'
+
+class Chef
+  class Knife
+    class Cloud
+      class OpenstackServerDelete < ServerDeleteCommand
+        include ServerDeleteOptions
+        include OpenstackServiceOptions
+        include OpenstackHelpers
+
+        banner "knife openstack server delete INSTANCEID [INSTANCEID] (options)"
+
+      end
+    end
+  end
+end

data/lib/chef/knife/openstack_server_list.rb

@@ -1,7 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@getchef.com>)
 # Author:: Matt Ray (<matt@getchef.com>)
-# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
+# Author:: Chirag Jog (<chirag@clogeny.com>)
+# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
+# Copyright:: Copyright (c) 2011-2013 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,73 +19,49 @@
 # limitations under the License.
 #
 
-require 'chef/knife/openstack_base'
+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
-    class OpenstackServerList < Knife
+    class Cloud
+      class OpenstackServerList < ServerListCommand
+        include OpenstackHelpers
+        include OpenstackServiceOptions
+        include ServerListOptions
 
-      include Knife::OpenstackBase
+        banner "knife openstack server list (options)"
 
-      banner "knife openstack server list (options)"
-
-      def run
-        $stdout.sync = true
+        def before_exec_command
+          #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'}
+          ]
+          @sort_by_field = "name"
+          super
+        end
 
-        validate!
+        def get_public_ip_address (addresses)
+          primary_public_ip_address(addresses)
+        end
 
-        server_list = [
-          ui.color('Name', :bold),
-          ui.color('Instance ID', :bold),
-          ui.color('Zone', :bold),
-          ui.color('Public IP', :bold),
-          ui.color('Private IP', :bold),
-          ui.color('Flavor', :bold),
-          ui.color('Image', :bold),
-          ui.color('Keypair', :bold),
-          ui.color('State', :bold)
-        ]
+        def get_private_ip_address (addresses)
+          primary_private_ip_address(addresses)
+        end
 
-        begin
-          connection.servers.all.sort_by(&:name).each do |server|
-            server_list << server.name
-            server_list << server.id.to_s
-            server_list << server.availability_zone
-            if primary_public_ip_address(server.addresses)
-              server_list << primary_public_ip_address(server.addresses)
-            else
-              server_list << ''
-            end
-            if primary_private_ip_address(server.addresses)
-              server_list << primary_private_ip_address(server.addresses)
-            else
-              server_list << ''
-            end
-            server_list << server.flavor['id'].to_s
-            if server.image
-              server_list << server.image['id']
-            else
-              server_list << ""
-            end
-            server_list << server.key_name
-            server_list << begin
-                             state = server.state.to_s.downcase
-                             case state
-                             when 'shutting-down','terminated','stopping','stopped','error','shutoff'
-                               ui.color(state, :red)
-                             when 'pending','build','paused','suspended','hard_reboot'
-                               ui.color(state, :yellow)
-                             else
-                               ui.color(state, :green)
-                             end
-                           end
-          end
-        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
+        def get_id(value)
+          value['id']
         end
-        puts ui.list(server_list, :uneven_columns_across, 9)
 
       end
     end

data/lib/chef/knife/openstack_server_show.rb

@@ -0,0 +1,57 @@
+#
+# Copyright:: Copyright (c) 2011-2013 Chef Software, Inc.
+# 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.
+#
+
+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
+    class Cloud
+      class OpenstackServerShow < ServerShowCommand
+        include OpenstackHelpers
+        include OpenstackServiceOptions
+        include ServerShowOptions
+
+        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 => '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'}
+        ]
+          super
+        end
+
+        def get_id(value)
+          value['id']
+        end
+      end
+    end
+  end
+end

data/lib/knife-openstack/version.rb

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

data/spec/functional/flavor_list_func_spec.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
+# Author:: Ameya Varade (<ameya.varade@clogeny.com>)
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
+# 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.
+
+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
+    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})
+                   ]
+      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!)
+    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)
+      instance.run
+    end
+  end
+end

data/spec/functional/group_list_func_spec.rb

@@ -0,0 +1,67 @@
+#
+# Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
+# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
+# Author:: Ameya Varade (<ameya.varade@clogeny.com>)
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
+# 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.
+
+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
+    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
+                                                                                   })
+                                                                ]
+                                    })
+                  ]
+      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!)
+    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)
+      instance.run
+    end
+  end
+end

data/spec/functional/image_list_func_spec.rb

@@ -0,0 +1,51 @@
+#
+# Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
+# Author:: Ameya Varade (<ameya.varade@clogeny.com>)
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
+# 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.
+
+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
+    before do
+      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!)
+    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)
+      instance.run
+    end
+
+    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)
+      instance.run
+    end
+  end
+end