knife-cloud 1.2.0.rc.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9bd37b28f654e1519bd6257e85df5b334b3552c
-  data.tar.gz: 50388a4270d158c12fda15ed43e8cd69e832283a
+  metadata.gz: 4ee4f881dd2d188f7667e32dd23170942f908827
+  data.tar.gz: c2eb79c92ecbe38059ded6138802f67ce7531f45
 SHA512:
-  metadata.gz: 53083a0e00ae32d660d4a3ef22994b0348d54e5439001dcc7004b57bf6388cc6465625cc3d048dac6bd2aba2df2fb5900bc0e3d0232907e4e57e207706107205
-  data.tar.gz: 4b456d12c67e2d7485a2e89ab162ea1e17105c87ca6326ae55499722ab30fa30c98a3f5c385fb0fa39279057cfe883246de257c2aab361ddc70a9ac2c82cb2b2
+  metadata.gz: 9de1b62043893d528a727d619be4f77448b8fa72b02650b28f77a202630a8976177c6210c5c113ce36bdd18acb370c8de976565de211457e6b854e8b6e986f68
+  data.tar.gz: 590e7718a81e42b18d99a13d4bc2535b5eef192fdcc8f82939d4da0db3ae2e42e019651a886c41353f8447c66c5328ab64183b979bbfd901adc647cf8890bfa0

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

@@ -31,6 +31,7 @@ class Chef
         class ServerShowError < KnifeCloudError; end
         class ChefServerError < KnifeCloudError; end
         class NetworkNotFoundError < KnifeCloudError; end
+        class NotFoundError < KnifeCloudError; end
       end
     end
   end

data/lib/chef/knife/cloud/fog/service.rb

@@ -128,7 +128,7 @@ class Chef
         def handle_excon_exception(exception_class, e)
           error_message = if e.response
                             response = Chef::JSONCompat.from_json(e.response.body)
-                            "Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}"
+                            "Unknown server error (#{response[response.keys[0]]['code']}): #{response[response.keys[0]]['message']}"
                           else
                             "Unknown server error : #{e.message}"
                           end
@@ -138,14 +138,74 @@ class Chef
 
         def list_resource_configurations
           begin
-            flavors = connection.flavors.all
+            connection.flavors.all
           rescue Excon::Errors::BadRequest => e
             handle_excon_exception(CloudExceptions::CloudAPIException, e)
           end
         end
 
+        def list_addresses
+          connection.addresses.all
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::CloudAPIException, e)
+        end
+
+        def release_address(address_id)
+          response = get_address(address_id)
+          msg_pair('IP address', get_address_ip(response))
+          puts
+          ui.confirm('Do you really want to delete this ip')
+          connection.release_address(address_id)
+        rescue Fog::Compute::OpenStack::NotFound => e
+          error_message = 'Floating ip not found.'
+          ui.error(error_message)
+          raise CloudExceptions::NotFoundError, "#{e.message}"
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
+        end
+
+        def get_address_ip(response)
+          response.body['floating_ip']['ip'] if response.body['floating_ip']
+        end
+
+        def get_address(address_id)
+          connection.get_address(address_id)
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
+        end
+
+        def allocate_address(pool = nil)
+          response = connection.allocate_address(pool)
+          response.body
+        rescue Fog::Compute::OpenStack::NotFound => e
+          error_message = 'Floating ip pool not found.'
+          ui.error(error_message)
+          raise CloudExceptions::NotFoundError, "#{e.message}"
+        rescue Excon::Errors::Forbidden => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
+        end
+
+        def associate_address(*args)
+          connection.associate_address(*args)
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
+        end
+
+        def disassociate_address(*args)
+          connection.disassociate_address(*args)
+        rescue Fog::Compute::OpenStack::NotFound
+          error_message = 'Floating ip not found.'
+          ui.error(error_message)
+        rescue Excon::Errors::UnprocessableEntity => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
+        end
+
         def delete_server_on_failure(server = nil)
-          server.destroy if ! server.nil?
+          server.destroy unless server.nil?
         end
 
         def add_api_endpoint
@@ -157,11 +217,9 @@ class Chef
         end
 
         def get_server(instance_id)
-          begin
-            server = connection.servers.get(instance_id)
-          rescue Excon::Errors::BadRequest => e
-            handle_excon_exception(CloudExceptions::KnifeCloudError, e)
-          end
+          connection.servers.get(instance_id)
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
 
         def get_image(name_or_id)
@@ -193,7 +251,6 @@ class Chef
           image_info = connection.images.get(image)
           !image_info.nil? ? image_info.platform == 'windows' : false
         end
-
       end
     end
   end

data/lib/knife-cloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloud
-    VERSION = "1.2.0.rc.0"
+    VERSION = "1.2.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/unit/fog_service_spec.rb

@@ -82,7 +82,7 @@ describe Chef::Knife::Cloud::FogService do
 
     it "sets the provided attributes with supplied values" do
       expect(@server_def[:state] == "Inactive").to be true
-    end 
+    end
   end
 
   ["servers", "images", "networks"].each do |resource_type|
@@ -93,9 +93,9 @@ describe Chef::Knife::Cloud::FogService do
                   :connection
                 end
     context "list #{resource_type}" do
-      
+
       it "lists #{resource_type} of the current cloud service provider account." do
-        allow(instance).to receive_message_chain(resource.to_sym, "#{resource_type}".to_sym, :all) 
+        allow(instance).to receive_message_chain(resource.to_sym, "#{resource_type}".to_sym, :all)
         instance.method("list_#{resource_type}").call
       end
 
@@ -135,4 +135,29 @@ describe Chef::Knife::Cloud::FogService do
       expect { instance.delete_server(server_name) }.to raise_error(Chef::Knife::Cloud::CloudExceptions::ServerDeleteError, error_message)
     end
   end
+
+  context '#release_address' do
+    before(:each) do
+      allow(instance).to receive(:add_api_endpoint)
+      allow(Fog::Compute).to receive(:new).with({:provider => 'Any Cloud Provider'})
+    end
+
+    it 'releases address successfully' do
+      address_id = 'test-addres-id'
+      @address = TestResource.new('body' => { 'floating_ip' =>
+                                            { 'instance_id' => nil,
+                                              'ip' => '127.0.0.1',
+                                              'fixed_ip' => nil,
+                                              'id' => 'test-addres-id',
+                                              'pool' => 'public-110'
+                                            }
+                                          })
+      instance.ui = double
+      expect(instance).to receive(:get_address).and_return(@address)
+      expect(instance).to receive(:msg_pair).with('IP address', '127.0.0.1')
+      expect(instance.ui).to receive(:confirm)
+      allow(instance.connection).to receive(:release_address)
+      instance.release_address(address_id)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kaustubh Deorukhkar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -214,9 +214,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -246,4 +246,3 @@ test_files:
 - spec/unit/unix_distribution_spec.rb
 - spec/unit/windows_distribution_spec.rb
 - spec/unit/winrm_bootstrap_protocol_spec.rb
-has_rdoc: