misty 1.4.0 → 1.5.1

data/test/unit/cloud/services_test.rb

@@ -75,7 +75,7 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('backup', 'freezer')), :headers => token_header)
 
-    cloud.backup.must_be_kind_of Misty::Openstack::Freezer::V1
+    cloud.backup.must_be_kind_of Misty::Openstack::API::Freezer::V1
   end
 
   it '#baremetal' do
@@ -87,19 +87,19 @@ describe 'Misty::Cloud' do
       with(:headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(versions), :headers => {})
 
-    cloud.baremetal.must_be_kind_of Misty::Openstack::Ironic::V1
+    cloud.baremetal.must_be_kind_of Misty::Openstack::API::Ironic::V1
   end
 
   it '#blockStorage' 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('volume', 'cinder')), :headers => token_header)
+      to_return(:status => 200, :body => JSON.dump(auth_response_v3('volumev3', 'cinder')), :headers => token_header)
 
     stub_request(:get, 'http://localhost/').
       with(:headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(versions), :headers => {})
 
-    cloud.block_storage.must_be_kind_of Misty::Openstack::Cinder::V3
+    cloud.block_storage.must_be_kind_of Misty::Openstack::API::Cinder::V3
   end
 
   describe '#compute' do
@@ -112,7 +112,7 @@ describe 'Misty::Cloud' do
         with(:headers => auth_headers).
         to_return(:status => 200, :body => JSON.dump(versions), :headers => {})
 
-      cloud.compute.must_be_kind_of Misty::Openstack::Nova::V2_1
+      cloud.compute.must_be_kind_of Misty::Openstack::API::Nova::V2_1
     end
 
     it 'with microversion provided' do
@@ -126,7 +126,7 @@ describe 'Misty::Cloud' do
 
       compute_cloud = Misty::Cloud.new(:auth => auth, :compute => {:version => '2.17'})
 
-      compute_cloud.compute.must_be_kind_of Misty::Openstack::Nova::V2_1
+      compute_cloud.compute.must_be_kind_of Misty::Openstack::API::Nova::V2_1
 
       stub_request(:get, "http://localhost/servers").
         with(:headers => {'Accept'=>'application/json; q=1.0', 'X-Auth-Token'=>'token_data', 'X-Openstack-Nova-Api-Version'=>'2.17'})
@@ -145,7 +145,7 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('data-processing', 'sahara')), :headers => token_header)
 
-    cloud.data_processing.must_be_kind_of Misty::Openstack::Sahara::V1_1
+    cloud.data_processing.must_be_kind_of Misty::Openstack::API::Sahara::V1_1
   end
 
   it '#identity' do
@@ -153,7 +153,7 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => token_header)
 
-    cloud.identity.must_be_kind_of Misty::Openstack::Keystone::V3
+    cloud.identity.must_be_kind_of Misty::Openstack::API::Keystone::V3
   end
 
   it '#image' do
@@ -161,7 +161,7 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('image', 'glance')), :headers => token_header)
 
-    cloud.image.must_be_kind_of Misty::Openstack::Glance::V2
+    cloud.image.must_be_kind_of Misty::Openstack::API::Glance::V2
   end
 
   it '#load_balancer' do
@@ -169,15 +169,15 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('load-balancer', 'octavia')), :headers => token_header)
 
-    cloud.load_balancer.must_be_kind_of Misty::Openstack::Octavia::V2_0
+    cloud.load_balancer.must_be_kind_of Misty::Openstack::API::Octavia::V2_0
   end
 
-  it '#networking' do
+  it '#network' 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('networking', 'neutron')), :headers => token_header)
+      to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => token_header)
 
-    cloud.networking.must_be_kind_of Misty::Openstack::Neutron::V2_0
+    cloud.network.must_be_kind_of Misty::Openstack::API::Neutron::V2_0
   end
 
   it '#nfv_orchestration' do
@@ -185,7 +185,7 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('nfv-orchestration', 'tacker')), :headers => token_header)
 
-    cloud.nfv_orchestration.must_be_kind_of Misty::Openstack::Tacker::V1_0
+    cloud.nfv_orchestration.must_be_kind_of Misty::Openstack::API::Tacker::V1_0
   end
 
   describe '#objectStorage' do
@@ -194,7 +194,7 @@ describe 'Misty::Cloud' do
         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
+      cloud.object_storage.must_be_kind_of Misty::Openstack::API::Swift::V1
     end
 
     it 'execute bulk_delete' do
@@ -216,7 +216,7 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('orchestration', 'heat')), :headers => token_header)
 
-    cloud.orchestration.must_be_kind_of Misty::Openstack::Heat::V1
+    cloud.orchestration.must_be_kind_of Misty::Openstack::API::Heat::V1
   end
 
   it '#search' do
@@ -224,34 +224,34 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('search', 'searchlight')), :headers => token_header)
 
-    cloud.search.must_be_kind_of Misty::Openstack::Searchlight::V1
+    cloud.search.must_be_kind_of Misty::Openstack::API::Searchlight::V1
   end
 
   it '#sharedFileSystems' 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('shared-file-systems', 'manila')), :headers => token_header)
+      to_return(:status => 200, :body => JSON.dump(auth_response_v3('shared-file-system', 'manila')), :headers => token_header)
 
     stub_request(:get, 'http://localhost/').
       with(:headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(versions), :headers => {})
 
-    cloud.shared_file_systems.must_be_kind_of Misty::Openstack::Manila::V2
+    cloud.shared_file_systems.must_be_kind_of Misty::Openstack::API::Manila::V2
   end
 
   describe 'prefixed service name' do
-    it '#network match networking' do
+    it '#network match network' 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('networking', 'neutron')), :headers => token_header)
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => token_header)
 
-      cloud.network.must_be_kind_of Misty::Openstack::Neutron::V2_0
+      cloud.network.must_be_kind_of Misty::Openstack::API::Neutron::V2_0
     end
 
     it '#data is ambiguous' 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('Identity', 'keystone')), :headers => token_header)
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => token_header)
 
       proc do
         cloud.data

data/test/unit/cloud_test.rb

@@ -32,28 +32,28 @@ describe Misty::Cloud do
     it 'uses default version' do
       auth_request
       cloud = Misty::Cloud.new(arg)
-      cloud.identity.must_be_kind_of Misty::Openstack::Keystone::V3
+      cloud.identity.must_be_kind_of Misty::Openstack::API::Keystone::V3
     end
 
     it 'uses default version when provided version is out of range' do
       auth_request
       arg.merge!(:identity => {:api_version => 'v1'})
       cloud = Misty::Cloud.new(arg)
-      cloud.identity.must_be_kind_of Misty::Openstack::Keystone::V3
+      cloud.identity.must_be_kind_of Misty::Openstack::API::Keystone::V3
     end
 
     it 'uses provided version' do
       auth_request
       arg.merge!(:identity => {:api_version => 'v2.0'})
       cloud = Misty::Cloud.new(arg)
-      cloud.identity.must_be_kind_of Misty::Openstack::Keystone::V2_0
+      cloud.identity.must_be_kind_of Misty::Openstack::API::Keystone::V2_0
     end
   end
 
   describe 'Each service' do
     it 'has a method defined' do
       Misty::services.each do |service|
-        method =  Misty::Cloud.method_defined?(service.name)
+        method =  Misty::Cloud.method_defined?(service.type)
         method.must_equal true
       end
     end
@@ -88,7 +88,7 @@ describe Misty::Cloud do
 
         proc do
           Misty::Cloud.new(:auth => authv3_data)
-        end.must_raise Misty::Auth::URLError
+        end.must_raise Misty::Auth::Token::URLError
       end
 
       it 'with empty url' do
@@ -101,7 +101,7 @@ describe Misty::Cloud do
 
         proc do
           Misty::Cloud.new(:auth => authv3_data)
-        end.must_raise Misty::Auth::URLError
+        end.must_raise Misty::Auth::Token::URLError
       end
     end
 
@@ -116,10 +116,10 @@ describe Misty::Cloud do
           }
         end
 
-        it 'uses AuthV2' do
+        it 'uses Misty::Auth::Token::V3' do
           authv2 = Minitest::Mock.new
 
-          Misty::AuthV2.stub :new, authv2 do
+            Misty::Auth::Token::V2.stub :new, authv2 do
             cloud = Misty::Cloud.new(:auth => authv2_data)
             assert_mock authv2
           end
@@ -136,10 +136,10 @@ describe Misty::Cloud do
           }
         end
 
-        it 'uses AuthV3' do
+        it 'uses Misty::Auth::Token::V3' do
           authv3 = Minitest::Mock.new
 
-          Misty::AuthV3.stub :new, authv3 do
+          Misty::Auth::Token::V3.stub :new, authv3 do
             cloud = Misty::Cloud.new(:auth => authv3_data)
             assert_mock authv3
           end

data/test/unit/http/method_builder_test.rb

@@ -3,15 +3,14 @@ require 'misty/http/method_builder'
 
 describe Misty::HTTP::MethodBuilder do
   let(:service) do
-    class Service
-      include Misty::HTTP::MethodBuilder
+    service = Object.new
+    service.extend(Misty::HTTP::MethodBuilder)
 
-      def base_path=(val)
-        @base_path = val
-      end
+    def service.base_path=(val)
+      @base_path = val
     end
 
-    Service.new
+    service
   end
 
   describe '#base_filter' do
@@ -37,8 +36,8 @@ describe Misty::HTTP::MethodBuilder do
   end
 
   describe '#get_method' do
-    class Service
-      def api
+    before do
+      def service.api
         {
           '/' => { GET: [:list_api_versions] },
           '/v2.0/' => { GET: [:show_api_v2_details] },
@@ -78,10 +77,8 @@ describe Misty::HTTP::MethodBuilder do
 
   describe '#prefixed_path' do
     it 'returns true and same path with empty prefix' do
-      class Service
-        def prefix_path_to_ignore
-          ''
-        end
+      def service.prefix_path_to_ignore
+        ''
       end
 
       path = '/v3/resources/type'
@@ -91,10 +88,8 @@ describe Misty::HTTP::MethodBuilder do
     end
 
     it 'returns false and same path when unmatched prefix' do
-      class Service
-        def prefix_path_to_ignore
-          '/v3/{project_id}'
-        end
+      def service.prefix_path_to_ignore
+        '/v3/{project_id}'
       end
 
       path = '/v2/schemas/tasks'
@@ -104,10 +99,8 @@ describe Misty::HTTP::MethodBuilder do
     end
 
     it 'returns true and filtered path when matched prefix' do
-      class Service
-        def prefix_path_to_ignore
-          '/v3/{project_id}'
-        end
+      def service.prefix_path_to_ignore
+        '/v3/{project_id}'
       end
 
       path = '/v3/{project_id}/backups/detail'
@@ -128,12 +121,9 @@ describe Misty::HTTP::MethodBuilder do
 
     it 'returns a query string when passing in a Hash' do
       service.send(:query_param, {}).must_equal ''
-
       service.send(:query_param, {:foo  => 'bar'}).must_equal '?foo=bar'
       service.send(:query_param, {'foo' => 'bar'}).must_equal '?foo=bar'
-
       service.send(:query_param, {:foo => ['bar', 'baz'], :value => 42, :flag => nil }).must_equal '?foo=bar&foo=baz&value=42&flag'
-
       service.send(:query_param, {'===' => 'Ëncøding is hárd!'}).must_equal '?%3D%3D%3D=%C3%8Bnc%C3%B8ding+is+h%C3%A1rd%21'
     end
 

data/test/unit/http/request_test.rb

@@ -126,7 +126,7 @@ describe Misty::HTTP::Request do
     end
 
     it '#http_to_s' do
-      service.http_to_s('VERB', '/resource', 'headers',  'data'  => 'value').must_equal "HTTP VERB base_url='localhost:80', path='/resource', header=headers, data='{\"data\"=>\"value\"}'"
+      service.http_to_s('VERB', 'resource', 'headers',  'data'  => 'value').must_equal "HTTP VERB 'localhost:80/resource', header=headers, data='{\"data\"=>\"value\"}'"
     end
   end
 end

data/test/unit/microversion_test.rb

@@ -41,9 +41,9 @@ describe Misty::Microversion do
         to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
         def service.setup
-          @uri = URI.parse('http://localhost/')
+          @endpoint = URI.parse('http://localhost/')
           @log = Logger.new('/dev/null')
-          @auth = Misty::AuthV3.new(
+          @token = Misty::Auth::Token::V3.new(
             :url             => 'http://localhost:5000',
             :user_id         => 'user_id',
             :password        => 'secret',
@@ -51,27 +51,22 @@ describe Misty::Microversion do
           )
         end
         service.setup
-      end
 
-      let(:fetch_request) do
         stub_request(:get, "http://localhost/").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby', 'X-Auth-Token'=>'token_data'}).
-        to_return(:status => 200, :body => JSON.dump(versions_data), :headers => {})
+          with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby', 'X-Auth-Token'=>'token_data'}).
+          to_return(:status => 200, :body => JSON.dump(versions_data), :headers => {})
       end
 
       it 'set microversion when number within min/max range' do
-        fetch_request
-
-        def service.service_names
-          %w{service_name1}
+        def service.service_types
+          %w(service_type1)
         end
 
-        service.microversion_header('2.60').must_equal({"X-Openstack-API-Version" => "service_name1 2.60"})
+        service.set_version('2.60')
+        service.microversion_header('2.60').must_equal({"X-Openstack-API-Version" => "service_type1 2.60"})
       end
 
       it 'fails when asked version is not within min-max range' do
-        fetch_request
-
         proc do
           service.set_version('3.20')
         end.must_raise Misty::Microversion::VersionError
@@ -79,10 +74,12 @@ describe Misty::Microversion do
     end
 
     it "set microversion to 'latest'" do
-      def service.service_names
-        %w{service_name2}
+      def service.service_types
+        %w(service_type2)
       end
-      service.microversion_header('latest').must_equal({"X-Openstack-API-Version" => "service_name2 latest"})
+
+      service.set_version('latest')
+      service.microversion_header('latest').must_equal({"X-Openstack-API-Version" => "service_type2 latest"})
     end
 
     it 'fails when version is a wrong word' do

data/test/unit/misty_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 def validate_service(service)
   service.must_be_kind_of Misty::Service
-  service.name.must_be_kind_of Symbol
+  service.type.must_be_kind_of Symbol
   service.project.must_be_kind_of Symbol
 end
 
@@ -20,116 +20,116 @@ end
 describe Misty do
   describe '#set_services' do
     it 'has alarming service' do
-      service = Misty::services.find { |s| s.name == :alarming}
+      service = Misty::services.find { |s| s.type == :alarming}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has baremetal service' do
-      service = Misty::services.find { |s| s.name == :baremetal}
+      service = Misty::services.find { |s| s.type == :baremetal}
       validate_service(service)
       validate_microversion(service)
     end
 
     it 'has block_storage service' do
-      service = Misty::services.find { |s| s.name == :block_storage}
+      service = Misty::services.find { |s| s.type == :block_storage}
       validate_service(service)
       validate_versions(service)
       validate_microversion(service)
     end
 
     it 'has clustering service' do
-      service = Misty::services.find { |s| s.name == :clustering}
+      service = Misty::services.find { |s| s.type == :clustering}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has compute service' do
-      service = Misty::services.find { |s| s.name == :compute}
+      service = Misty::services.find { |s| s.type == :compute}
       validate_service(service)
       validate_microversion(service)
     end
 
     it 'has container_infrastructure_management service' do
-      service = Misty::services.find { |s| s.name == :container_infrastructure_management}
+      service = Misty::services.find { |s| s.type == :container_infrastructure_management}
       validate_service(service)
       validate_microversion(service)
     end
 
     it 'has data_processing service' do
-      service = Misty::services.find { |s| s.name == :data_processing}
+      service = Misty::services.find { |s| s.type == :data_processing}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has data_protection service' do
-      service = Misty::services.find { |s| s.name == :data_protection_orchestration}
+      service = Misty::services.find { |s| s.type == :data_protection_orchestration}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has database service' do
-      service = Misty::services.find { |s| s.name == :database}
+      service = Misty::services.find { |s| s.type == :database}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has dns service' do
-      service = Misty::services.find { |s| s.name == :dns}
+      service = Misty::services.find { |s| s.type == :dns}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has identity service' do
-      service = Misty::services.find { |s| s.name == :identity}
+      service = Misty::services.find { |s| s.type == :identity}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has image service' do
-      service = Misty::services.find { |s| s.name == :image}
+      service = Misty::services.find { |s| s.type == :image}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has messaging service' do
-      service = Misty::services.find { |s| s.name == :messaging}
+      service = Misty::services.find { |s| s.type == :messaging}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has metering service' do
-      service = Misty::services.find { |s| s.name == :metering}
+      service = Misty::services.find { |s| s.type == :metering}
       validate_service(service)
       validate_versions(service)
     end
 
-    it 'has networking service' do
-      service = Misty::services.find { |s| s.name == :networking}
+    it 'has network service' do
+      service = Misty::services.find { |s| s.type == :network}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has object_storage service' do
-      service = Misty::services.find { |s| s.name == :object_storage}
+      service = Misty::services.find { |s| s.type == :object_storage}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has orchestration service' do
-      service = Misty::services.find { |s| s.name == :orchestration}
+      service = Misty::services.find { |s| s.type == :orchestration}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has search service' do
-      service = Misty::services.find { |s| s.name == :search}
+      service = Misty::services.find { |s| s.type == :search}
       validate_service(service)
       validate_versions(service)
     end
 
     it 'has shared_file_systems service' do
-      service = Misty::services.find { |s| s.name == :shared_file_systems}
+      service = Misty::services.find { |s| s.type == :shared_file_systems}
       validate_service(service)
       validate_microversion(service)
     end
@@ -142,41 +142,43 @@ describe Misty do
     end
   end
 
-  describe '#json_encode?' do
-    it 'true with a Array type' do
-      Misty.json_encode?([]).must_equal true
-    end
+  describe 'Misty::Helper' do
+    describe '#json_encode?' do
+      it 'true with a Array type' do
+        Misty::Helper.json_encode?([]).must_equal true
+      end
 
-    it 'true with a Hash type' do
-      Misty.json_encode?({}).must_equal true
-    end
+      it 'true with a Hash type' do
+        Misty::Helper.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 'true with a JSON String type' do
+        Misty::Helper.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
+      it 'false with a non JSON String type' do
+        Misty::Helper.json_encode?("Just a string").must_equal false
+      end
     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
-    end
+    describe '#to_json' do
+      it 'returns a JSON string when using a Ruby hash' do
+        Misty::Helper.to_json({'key' => 'val'}).must_be_kind_of String
+      end
 
-    it 'returns same string when using a string' do
-      data = "{\"key\": \"val\"}"
-      response = Misty.to_json(data)
-      response.must_be_kind_of String
-      response.must_equal data
-    end
+      it 'returns same string when using a string' do
+        data = "{\"key\": \"val\"}"
+        response = Misty::Helper.to_json(data)
+        response.must_be_kind_of String
+        response.must_equal data
+      end
 
-    it 'fails when using a string with non JSON data' do
-      data = 'key;val'
-      proc do
-        response = Misty.to_json(data)
-      end.must_raise JSON::ParserError
+      it 'fails when using a string with non JSON data' do
+        data = 'key;val'
+        proc do
+          response = Misty::Helper.to_json(data)
+        end.must_raise JSON::ParserError
+      end
     end
   end
 end