misty 1.1.0 → 1.2.0

data/lib/misty/openstack/zaqar/zaqar_v2.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::ZaqarV2
-  def v2
+  def api
 {"/"=>{:GET=>[:list_major_versions]},
  "/v2/queues"=>{:GET=>[:list_queues]},
  "/v2/queues/{queue_name}"=>

data/lib/misty/version.rb

@@ -1,3 +1,3 @@
 module Misty
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test/unit/{http/client_test.rb → client_test.rb}

@@ -1,15 +1,27 @@
 require 'test_helper'
 require 'service_helper'
-require 'misty/http/client'
+require 'misty/client'
+
+describe Misty::Client do
+  describe '#prefix_path_to_ignore' do
+    let(:client) do
+      client = Object.new
+      client.extend(Misty::Client)
+      client
+    end
 
-describe Misty::HTTP::Client do
-  describe '#self.prefix_path_to_ignore' do
     it "returns empty String when undefined in API's module" do
-      Misty::Openstack::Neutron::V2_0::prefix_path_to_ignore.must_be_empty
+      client.prefix_path_to_ignore.must_be_empty
     end
 
     it "returns String when defined in API's module" do
-      Misty::Openstack::Cinder::V3.prefix_path_to_ignore.must_equal '/v3/{tenant_id}'
+      class << client
+        def prefix_path_to_ignore
+          '/v3/{tenant_id}'
+        end
+      end
+
+      client.prefix_path_to_ignore.must_equal '/v3/{tenant_id}'
     end
   end
 
@@ -30,7 +42,7 @@ describe Misty::HTTP::Client do
   describe '#setup' do
     it 'use default options' do
       options = service.send(:setup, {})
-      options.must_be_kind_of Misty::HTTP::Client::Options
+      options.must_be_kind_of Misty::Client::Options
       options.base_path.must_be_nil
       options.base_url.must_be_nil
       options.headers.must_equal ({})
@@ -62,13 +74,13 @@ describe Misty::HTTP::Client do
     it 'fails with invalid interface' do
       proc do
         service.send(:setup, {:interface => 'something'})
-      end.must_raise Misty::HTTP::Client::InvalidDataError
+      end.must_raise Misty::Client::InvalidDataError
     end
 
     it 'fails unless ssl_verify_mode is a boolean' do
       proc do
         service.send(:setup, {:ssl_verify_mode => 'something'})
-      end.must_raise Misty::HTTP::Client::InvalidDataError
+      end.must_raise Misty::Client::InvalidDataError
     end
   end
 

data/test/unit/cloud/requests_test.rb

@@ -81,13 +81,49 @@ describe Misty::Cloud do
     end
 
     it 'sucessful whith elements in pathwhith elements in path' do
-        stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
-          to_return(:status => 200, :body => JSON.dump(auth_response_v3('orchestration', 'heat')), :headers => {'x-subject-token'=>'token_data'})
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('orchestration', 'heat')), :headers => {'x-subject-token'=>'token_data'})
+
+      stub_request(:post, 'http://localhost/stacks/id1/id2/snapshots').
+      to_return(:status => 201, :body => 'snapshots', :headers => {})
+
+      cloud.orchestration.snapshot_a_stack('id1', 'id2', "{\"key\": \"value\"}").response.must_be_kind_of Net::HTTPCreated
+    end
+
+    it 'sucessful whith Array type data' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
+
+      stub_request(:post, 'http://localhost/v2.0/networks').
+        with(:body => "[\"network\",{\"name\":\"network1\"}]").
+        with(:headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 201, :body => "", :headers => {})
+
+      cloud.networking.create_network(['network', {'name' => 'network1'}]).response.must_be_kind_of Net::HTTPCreated
+    end
+
+    it 'sucessful with Hash type data' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
+
+      stub_request(:post, 'http://localhost/v2.0/networks').
+        with(:body => "{\"network\":{\"name\":\"network1\"}}").
+        with(:headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 201, :body => "", :headers => {})
+
+      cloud.networking.create_network({'network' => {'name' => 'network1'}}).response.must_be_kind_of Net::HTTPCreated
+    end
+
+    it 'sucessful with JSON String data' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
 
-        stub_request(:post, 'http://localhost/stacks/id1/id2/snapshots').
-        to_return(:status => 201, :body => 'snapshots', :headers => {})
+      stub_request(:post, 'http://localhost/v2.0/networks').
+        with(:body => "{\"network\":{\"name\":\"network1\"}}").
+        with(:headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 201, :body => "", :headers => {})
 
-        cloud.orchestration.snapshot_a_stack('id1', 'id2', "{\"key\": \"value\"}").response.must_be_kind_of Net::HTTPCreated
+      cloud.networking.create_network("{\"network\":{\"name\":\"network1\"}}").response.must_be_kind_of Net::HTTPCreated
     end
 
     it 'fails when not enough arguments' do
@@ -122,5 +158,41 @@ describe Misty::Cloud do
 
       cloud.identity.assign_role_to_group_on_domain('domain_id', 'group_id', 'roles_id').response.must_be_kind_of Net::HTTPOK
     end
+
+    it 'sucessful whith Array type data' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
+
+      stub_request(:put, 'http://localhost/v2.0/networks/network_id').
+        with(:body => "[\"network\",{\"name\":\"network2\"}]").
+        with(:headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "", :headers => {})
+
+      cloud.networking.update_network('network_id', ['network', {'name' => 'network2'}]).response.must_be_kind_of Net::HTTPOK
+    end
+
+    it 'sucessful with Hash type data' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
+
+      stub_request(:put, 'http://localhost/v2.0/networks/network_id').
+        with(:body => "{\"network\":{\"name\":\"network2\"}}").
+        with(:headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "", :headers => {})
+
+      cloud.networking.update_network('network_id', {'network' => {'name' => 'network2'}}).response.must_be_kind_of Net::HTTPOK
+    end
+
+    it 'sucessful with JSON String data' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
+
+      stub_request(:put, 'http://localhost/v2.0/networks/network_id').
+        with(:body => "{\"network\":{\"name\":\"network2\"}}").
+        with(:headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "", :headers => {})
+
+      cloud.networking.update_network('network_id', "{\"network\":{\"name\":\"network2\"}}").response.must_be_kind_of Net::HTTPOK
+    end
   end
 end

data/test/unit/cloud/services_test.rb

@@ -160,12 +160,27 @@ describe 'Misty::Cloud' do
     cloud.nfv_orchestration.must_be_kind_of Misty::Openstack::Tacker::V1_0
   end
 
-  it '#objectStorage' do
-    stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
-      with(:body => JSON.dump(auth_body), :headers => auth_headers).
-      to_return(:status => 200, :body => JSON.dump(auth_response_v3('object-store', 'swift')), :headers => token_header)
+  describe '#objectStorage' do
+    it 'initialize with success' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        with(:body => JSON.dump(auth_body), :headers => auth_headers).
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('object-store', 'swift')), :headers => token_header)
+
+      cloud.object_storage.must_be_kind_of Misty::Openstack::Swift::V1
+    end
 
-    cloud.object_storage.must_be_kind_of Misty::Openstack::Swift::V1
+    it 'execute bulk_delete' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        with(:body => JSON.dump(auth_body), :headers => auth_headers).
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('object-store', 'swift')), :headers => token_header)
+
+      stub_request(:post, "http://localhost/?bulk-delete=1").
+        with(:headers => {'Accept'=>'application/json; q=1.0', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'text/plain', 'User-Agent'=>'Ruby', 'X-Auth-Token'=>'token_data'}).
+        to_return(:status => 200, :body => "", :headers => {})
+
+      cloud.object_storage.requests.must_include :bulk_delete
+      cloud.object_storage.bulk_delete("container1/object1")
+    end
   end
 
   it '#orchestration' do

data/test/unit/http/header_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'misty/http/client'
 
 describe Misty::HTTP::Header do
   describe 'create' do

data/test/unit/http/method_builder_test.rb

@@ -38,7 +38,7 @@ describe Misty::HTTP::MethodBuilder do
 
   describe '#get_method' do
     class Service
-      def self.api
+      def api
         {
           '/' => { GET: [:list_api_versions] },
           '/v2.0/' => { GET: [:show_api_v2_details] },
@@ -79,7 +79,7 @@ describe Misty::HTTP::MethodBuilder do
   describe '#prefixed_path' do
     it 'returns true and same path with empty prefix' do
       class Service
-        def self.prefix_path_to_ignore
+        def prefix_path_to_ignore
           ''
         end
       end
@@ -92,7 +92,7 @@ describe Misty::HTTP::MethodBuilder do
 
     it 'returns false and same path when unmatched prefix' do
       class Service
-        def self.prefix_path_to_ignore
+        def prefix_path_to_ignore
           '/v3/{project_id}'
         end
       end
@@ -105,7 +105,7 @@ describe Misty::HTTP::MethodBuilder do
 
     it 'returns true and filtered path when matched prefix' do
       class Service
-        def self.prefix_path_to_ignore
+        def prefix_path_to_ignore
           '/v3/{project_id}'
         end
       end

data/test/unit/http/request_test.rb

@@ -88,32 +88,41 @@ describe Misty::HTTP::Request do
       response.must_be_kind_of Net::HTTPSuccess
     end
 
-    it '#http_patch' do
-      stub_request(:patch, 'http://localhost/resource').
-        with(:headers => request_header).
-        to_return(:status => 202, :body => "{\"key\": \"value\"}")
-
-      response = service.http_patch('/resource', {},  'data' => 'value')
-      response.must_be_kind_of Net::HTTPAccepted
-      response.body.wont_be_nil
+    describe '#http_patch' do
+      it 'successful with data of type String' do
+        stub_request(:patch, 'http://localhost/resource').
+          with(:body => "{\"data\":\"value\"}").
+          with(:headers => request_header).
+          to_return(:status => 202, :body => "{\"key\": \"value\"}")
+
+        response = service.http_patch('/resource', {}, "{\"data\":\"value\"}")
+        response.must_be_kind_of Net::HTTPAccepted
+        response.body.wont_be_nil
+      end
     end
 
-    it '#http_post' do
-      stub_request(:post, 'http://localhost/resource').
-        with(:headers => request_header).
-        to_return(:status => 201)
+    describe '#http_post' do
+      it 'successful with data of type String' do
+        stub_request(:post, 'http://localhost/resource').
+          with(:body => "{\"data\":\"value\"}").
+          with(:headers => request_header).
+          to_return(:status => 201)
 
-      response = service.http_post('/resource', {},  'data' => 'value')
-      response.must_be_kind_of Net::HTTPCreated
+        response = service.http_post('/resource', {}, "{\"data\":\"value\"}")
+        response.must_be_kind_of Net::HTTPCreated
+      end
     end
 
-    it '#http_put' do
-      stub_request(:put, 'http://localhost/resource').
-      with(:headers => request_header).
-      to_return(:status => 200)
+    describe '#http_put' do
+      it 'successful with data of type String' do
+        stub_request(:put, 'http://localhost/resource').
+          with(:body => "{\"data\":\"value\"}").
+          with(:headers => request_header).
+          to_return(:status => 200)
 
-      response = service.http_put('/resource', {},  'data' => 'value')
-      response.must_be_kind_of Net::HTTPOK
+        response = service.http_put('/resource', {}, "{\"data\":\"value\"}")
+        response.must_be_kind_of Net::HTTPOK
+      end
     end
 
     it '#http_to_s' do

data/test/unit/microversion_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 require 'auth_helper'
-require 'misty/http/client'
+require 'misty/client'
 require 'misty/microversion'
 
 describe Misty::Microversion do

data/test/unit/misty_test.rb

@@ -142,6 +142,24 @@ describe Misty do
     end
   end
 
+  describe '#json_encode?' do
+    it 'true with a Array type' do
+      Misty.json_encode?([]).must_equal true
+    end
+
+    it 'true with a Hash type' do
+      Misty.json_encode?({}).must_equal true
+    end
+
+    it 'true with a JSON String type' do
+      Misty.json_encode?('{"JSON_Key": "JSON_Value"}').must_equal true
+    end
+
+    it 'false with a non JSON String type' do
+      Misty.json_encode?("Just a string").must_equal false
+    end
+  end
+
   describe '#to_json' do
     it 'returns a JSON string when using a Ruby hash' do
       Misty.to_json({'key' => 'val'}).must_be_kind_of String

data/test/unit/openstack/APIs_test.rb

@@ -21,20 +21,25 @@ def api_valid?(api_entry)
   end
 end
 
-# For each OpenStack project version, generates an equivalent of the following example:
-# it 'Nova v2.1 loads a valid api structure' do
-#   require 'misty/openstack/nova/v2_1'
-#   api = Misty::Openstack::Nova::V2_1.api
-#   api_valid?(api)
-# end
+def api_validate(project, version)
+  it "#{project} #{version} loads a valid api structure" do
+    require "misty/openstack/#{project}/#{project}_#{Misty::Cloud.dot_to_underscore(version)}"
+    klass = Object.const_get("Misty::Openstack::#{project.capitalize}#{Misty::Cloud.dot_to_underscore(version).capitalize}")
+    client = Object.new
+    client.extend(klass)
+    api_valid?(client.api)
+  end
+end
+
+# Assert each version of OpenStack project loads a valid api structure
 describe 'Openstack API' do
   Misty.services.each do |service|
-    #service.versions.each do |version|
-    #  it "#{service.project} #{version} loads a valid api structure" do
-    #    require "misty/openstack/#{service.project}/#{Misty::Cloud.dot_to_underscore(version)}"
-    #    api = Object.const_get("Misty::Openstack::#{service.project.capitalize}::#{Misty::Cloud.dot_to_underscore(version).capitalize}").api
-    #    api_valid?(api)
-    #  end
-    #end
+    if service.versions
+      service.versions.each do |version|
+        api_validate(service.project, version)
+      end
+    elsif service.microversion && !service.microversion.empty?
+      api_validate(service.project, service.microversion)
+    end
   end
 end

data/test/unit/openstack/extension_test.rb

@@ -0,0 +1,68 @@
+require 'test_helper'
+require 'misty/openstack/extension'
+
+module DummyTestOpenstackExtension
+  def api
+    {
+      "/v1/resource1"      => {
+        :POST => [:method1, :method2],
+        :GET  => [:method3, :method4]
+      },
+      "/v2/resource2/{id}" => {
+        :GET    =>[:method5, :method6],
+        :PATCH  =>[:method7, :method8],
+        :DELETE =>[:method9, :method10]
+      }
+    }
+  end
+
+  def api_ext
+    {
+      "/v1/resource1"      => {
+        :POST => [:method11, :method12],
+        :PUT  => [:method13, :method14]
+      },
+      "/v1/resource3"      => {
+        :POST => [:method, :method],
+        :GET  => [:method]
+      }
+    }
+  end
+end
+
+describe Misty::Openstack::Extension do
+  let(:v1) do
+    v1 = Object.new
+    v1.extend(DummyTestOpenstackExtension)
+    v1.extend(Misty::Openstack::Extension)
+    v1
+  end
+
+  describe "Succesful" do
+    it "Adds methods to existing Verb" do
+      v1.api["/v1/resource1"][:POST].must_include :method11
+    end
+
+    it "Adds Verb" do
+      v1.api["/v1/resource1"].must_include :PUT
+    end
+
+    it "Adds Resource" do
+      v1.api.must_include "/v1/resource3"
+    end
+  end
+
+  describe "Fails" do
+    it "Raise RuntimeError when a resource already exist" do
+      class << v1
+        def api_ext
+          { "/v1/resource1" => { :POST => [:method1] } }
+        end
+      end
+
+      proc do
+        v1.api
+      end.must_raise RuntimeError
+    end
+  end
+end