misty 1.4.0 → 1.5.1

data/lib/misty/openstack/api/zaqar/v2.rb

@@ -0,0 +1,19 @@
+require 'misty/openstack/api/zaqar/zaqar_v2'
+require 'misty/openstack/service_pack'
+
+module Misty
+  module Openstack
+    module API
+      module Zaqar
+        class V2
+          include Misty::Openstack::API::ZaqarV2
+          include Misty::Openstack::ServicePack
+
+          def service_types
+            %w(message messaging)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/misty/openstack/{zaqar → api/zaqar}/zaqar_v2.rb

@@ -1,6 +1,6 @@
-module Misty::Openstack::ZaqarV2
+module Misty::Openstack::API::ZaqarV2
   def tag
-    'Messaging Service API Reference 6.0.0'
+    'Messaging Service API Reference 6.0.1'
   end
 
   def api

data/lib/misty/openstack/api/zun/v1.rb

@@ -0,0 +1,19 @@
+require 'misty/openstack/api/zun/zun_v1'
+require 'misty/openstack/service_pack'
+
+module Misty
+  module Openstack
+    module API
+      module Zun
+        class V1
+          include Misty::Openstack::API::ZunV1
+          include Misty::Openstack::ServicePack
+
+          def service_types
+            %w(application-container container)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/misty/openstack/api/zun/zun_v1.rb

@@ -0,0 +1,55 @@
+module Misty::Openstack::API::ZunV1
+  def tag
+    'Containers Service API Reference 1.0.1'
+  end
+
+  def api
+{"/v1/containers/"=>
+  {:POST=>[:create_new_container], :GET=>[:list_all_containers]},
+ "/v1/containers/{container_ident}"=>
+  {:GET=>[:show_details_of_a_container],
+   :DELETE=>[:delete_a_container],
+   :PATCH=>[:update_information_of_container]},
+ "/v1/containers/{container_ident}/kill"=>{:POST=>[:kill_a_container]},
+ "/v1/containers/{container_ident}/stats"=>
+  {:GET=>[:display_stats_of_a_container]},
+ "/v1/containers/{container_ident}/start"=>{:POST=>[:start_a_container]},
+ "/v1/containers/{container_ident}/stop"=>{:POST=>[:stop_a_container]},
+ "/v1/containers/{container_ident}/pause"=>{:POST=>[:pause_a_container]},
+ "/v1/containers/{container_ident}/unpause"=>{:POST=>[:unpause_a_container]},
+ "/v1/containers/{container_ident}/reboot"=>{:POST=>[:restart_a_container]},
+ "/v1/containers/{container_ident}/rename"=>{:POST=>[:rename_a_container]},
+ "/v1/containers/{container_ident}/get_archive"=>
+  {:GET=>[:get_archive_from_a_container]},
+ "/v1/containers/{container_ident}/put_archive"=>
+  {:POST=>[:put_archive_to_a_container]},
+ "/v1/containers/{container_ident}/add_securtiy_group"=>
+  {:POST=>[:add_security_group_for_specified_container]},
+ "/v1/containers/{container_ident}/commit"=>{:POST=>[:commit_a_container]},
+ "/v1/containers/{container_ident}/attach"=>{:GET=>[:attach_to_a_container]},
+ "/v1/containers/{container_ident}/network_detach"=>
+  {:POST=>[:detach_a_network_from_a_container]},
+ "/v1/containers/{container_ident}/resize"=>{:POST=>[:resize_a_container]},
+ "/v1/containers/{container_ident}/network_attach"=>
+  {:POST=>[:attach_a_network_to_a_container]},
+ "/v1/containers/{container_ident}/execute"=>
+  {:POST=>[:execute_command_in_a_running_container]},
+ "/v1/containers/{container_ident}/execute_resize"=>
+  {:POST=>[:resize_tty_when_execute_command_in_a_container]},
+ "/v1/containers/{container_ident}/logs"=>{:GET=>[:get_logs_of_a_container]},
+ "/v1/containers/{container_ident}/top"=>
+  {:GET=>[:display_the_running_processes_in_a_container]},
+ "/v1/containers/{container_ident}/network_list"=>
+  {:GET=>[:list_networks_on_a_container]},
+ "/v1/containers/{container_ident}/container_actions"=>
+  {:GET=>[:list_actions_for_container]},
+ "/v1/containers/{container_ident}/container_actions/{request_ident}"=>
+  {:GET=>[:show_container_action_details]},
+ "/v1/services"=>{:GET=>[:show_service_status], :DELETE=>[:delete_service]},
+ "/v1/services/enable"=>{:PUT=>[:enable_service]},
+ "/v1/services/disable"=>{:PUT=>[:disable_service]},
+ "/v1/services/force_down"=>{:PUT=>[:force_down_service]},
+ "/v1/hosts"=>{:GET=>[:list_all_compute_hosts]},
+ "/v1/hosts/{host_ident}"=>{:GET=>[:show_details_of_a_host]}}
+  end
+end

data/lib/misty/openstack/service.rb

@@ -3,12 +3,8 @@ module Misty
     module Service
       attr_reader :headers, :microversion
 
-      # ==== Attributes
-      #
-      # * +arg+ - +Misty::Config+ instance
-      #
       def initialize(arg)
-        @auth = arg[:auth]
+        @token = arg[:token]
         @log = arg[:log]
         @config = arg[:config]
 
@@ -16,11 +12,15 @@ module Misty
         @headers = Misty::HTTP::Header.new(@config[:headers].get.clone)
         @ssl_verify_mode = @config[:ssl_verify_mode]
 
-        @uri = URI.parse(@auth.get_url(service_names, @config[:region_id], @config[:interface]))
+        @endpoint = if @config[:endpoint]
+                      URI.parse(@config[:endpoint])
+                    else
+                      names = service_types
+                      names << @config[:service_name] if @config[:service_name]
+                      URI.parse(@token.catalog.get_endpoint_url(names, @config[:region], @config[:interface]))
+                    end
 
-        @base_path = @config[:base_path] ? @config[:base_path] : @uri.path
-        @base_path = @base_path.chomp('/')
-        @base_url  = @config[:base_url]  ? @config[:base_url] : nil
+        @base_path = @config[:base_path] ? @config[:base_path] : @endpoint.path.chomp('/')
 
         if microversion
           asked_version = @config[:version] ? @config[:version] : ''
@@ -46,7 +46,8 @@ module Misty
         requests_api + requests_custom
       end
 
-      # Each option is recreated to bear new value or the one propagated from defaults, globals or service levels
+      # Each option is recreated for a request brief life duration to account for a new value if provided or use value
+      # propagated from defaults, globals or service levels
       def request_config(arg = {})
         @request_content_type = arg[:content_type] ? arg[:content_type] : @content_type
         @request_headers = Misty::HTTP::Header.new(@headers.get.clone)
@@ -61,11 +62,6 @@ module Misty
         end
       end
 
-      # TODO: remove
-      def baseclass
-        self.class.to_s.split('::')[-1]
-      end
-
       private
 
       def requests_api
@@ -83,6 +79,13 @@ module Misty
       def requests_custom
         []
       end
+
+      def service_types_soon
+        project = self.class.to_s.split('::')[-2].downcase.to_sym
+        s = Misty.services.find {|service| service.project == project}
+        raise RuntimeError, 'No service types found' unless s&.name
+        s.microversion
+      end
     end
   end
 end

data/lib/misty/openstack/service_pack.rb

@@ -0,0 +1,18 @@
+require 'misty/openstack/service'
+require 'misty/http/net_http'
+require 'misty/http/method_builder'
+require 'misty/http/request'
+require 'misty/http/direct'
+require 'misty/http/header'
+
+module Misty
+  module Openstack
+    module ServicePack
+      include Misty::Openstack::Service
+      include Misty::HTTP::NetHTTP
+      include Misty::HTTP::MethodBuilder
+      include Misty::HTTP::Request
+      include Misty::HTTP::Direct
+    end
+  end
+end

data/lib/misty/service.rb

@@ -1,26 +1,24 @@
 module Misty
   class Service
-    attr_reader :name, :microversion, :project, :versions
+    attr_reader :type, :microversion, :project, :versions
 
     def initialize(params)
-      @name = params[:name]
+      @type = params[:type]
       @project = params[:project]
       @versions = params[:versions]
       @microversion = params[:microversion]
     end
 
     def to_s
-      str = "#{name}: #{project}"
+      str = "#{type}: #{project}"
       str << ", versions: #{@versions}" if @versions
       str << ", microversion: #{@microversion}" if @microversion
       str
     end
 
     def default_version(api_version = nil)
-      res = if api_version && (@versions&.include?(api_version) || api_version == @microversion)
+      res = if api_version && (@versions&.include?(api_version))
               api_version
-            elsif @microversion
-              @microversion
             else
               self.versions.sort[-1]
             end

data/lib/misty/services.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 require 'misty/service'
 
 module Misty
@@ -15,29 +16,29 @@ module Misty
     end
 
     def each
-      @services.each do |service|
-        yield service
+      @services.each do |s|
+        yield s
       end
     end
 
     def get(name)
-      @services.each do |service|
-        return service if service.name == name
+      each do |s|
+        return s if s.name == name
       end
       nil
     end
 
-    def names
-      service_names = []
-      @services.each do |service|
-        service_names << service.name
+    def types
+      list = []
+      each do |s|
+        list << s.type
       end
-      service_names
+      list
     end
 
     def to_s
       list = ''
-      @services.each do |service|
+      each do |service|
         list << service.to_s + "\n"
       end
       list

data/lib/misty/version.rb

@@ -1,3 +1,3 @@
 module Misty
-  VERSION = '1.4.0'
+  VERSION = '1.5.1'
 end

data/test/integration/compute_test.rb

@@ -19,7 +19,7 @@ describe 'Compute Service Nova v2.1 features' do
 
       # POST with body data
       server = { 'name': 'test_create_server', 'flavorRef': '1', 'imageRef': '07bd625e-d3ae-415c-bc82-46d66168378a', 'networks': [{'uuid': '204e3939-34d2-40af-b52d-f58cfec1e2b1'}]}
-      data = Misty.to_json('server' => server)
+      data = Misty::Helper.to_json('server' => server)
       response = cloud.compute.create_server(data)
       response.code.must_equal '202'
       id = response.body['server']['id']
@@ -36,7 +36,7 @@ describe 'Compute Service Nova v2.1 features' do
 
       # PUT with URI value and body data
       update_server = { 'name': 'test_updated_server' }
-      data = Misty.to_json('server' => update_server)
+      data = Misty::Helper.to_json('server' => update_server)
       response = cloud.compute.update_server(id, data)
       response.code.must_equal '200'
       response.body['server']['name'].must_equal 'test_updated_server'

data/test/integration/{networking_test.rb → network_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-describe 'Networking Service Neutron v2.0 features' do
+describe 'network Service Neutron v2.0 features' do
   let(:auth) do
     {
       :url                => 'http://192.0.2.6:5000',
@@ -13,34 +13,34 @@ describe 'Networking Service Neutron v2.0 features' do
   end
 
   it 'GET/POST/PUT/DELETE requests' do
-    VCR.use_cassette 'networking using neutron v2.0' do
-      cloud = Misty::Cloud.new(:auth => auth, :networking => {:api_version => 'v2.0'})
+    VCR.use_cassette 'network using neutron v2.0' do
+      cloud = Misty::Cloud.new(:auth => auth, :network => {:api_version => 'v2.0'})
 
       # POST with body data
-      data = Misty.to_json('network' => { 'name': 'test_network' })
-      response = cloud.networking.create_network(data)
+      data = Misty::Helper.to_json('network' => { 'name': 'test_network' })
+      response = cloud.network.create_network(data)
       response.code.must_equal '201'
       id = response.body['network']['id']
       id.wont_be_empty
 
       # GET
-      response = cloud.networking.list_networks
+      response = cloud.network.list_networks
       response.code.must_equal '200'
       response.body['networks'].size.must_equal 2
 
       # GET with URI value
-      response = cloud.networking.show_network_details(id)
+      response = cloud.network.show_network_details(id)
       response.code.must_equal '200'
       response.body['network']['name'].must_equal 'test_network'
 
       # PUT with URI value and body data
-      data = Misty.to_json('network' => { 'name': 'test_updated_network' })
-      response = cloud.networking.update_network(id, data)
+      data = Misty::Helper.to_json('network' => { 'name': 'test_updated_network' })
+      response = cloud.network.update_network(id, data)
       response.code.must_equal '200'
       response.body['network']['name'].must_equal 'test_updated_network'
 
       # DELETE with URI value
-      response = cloud.networking.delete_network(id)
+      response = cloud.network.delete_network(id)
       response.code.must_equal '204'
     end
   end

data/test/integration/orchestration_test.rb

@@ -64,13 +64,13 @@ describe 'Orchestration Service using Heat v1' do
       cloud = Misty::Cloud.new(:auth => auth, :orchestration => {:api_version => 'v1'})
 
       # POST with body data
-      data_heat_template1 = Misty.to_json(heat_template1)
+      data_heat_template1 = Misty::Helper.to_json(heat_template1)
       response = cloud.orchestration.create_stack(data_heat_template1)
       response.code.must_equal '201'
       id1 = response.body['stack']['id']
       id1.wont_be_empty
 
-      data_heat_template2 = Misty.to_json(heat_template2)
+      data_heat_template2 = Misty::Helper.to_json(heat_template2)
       response = cloud.orchestration.create_stack(data_heat_template2)
       response.code.must_equal '201'
       id2 = response.body['stack']['id']
@@ -90,12 +90,12 @@ describe 'Orchestration Service using Heat v1' do
       # Updating the network template because it's faster to execute
       # therefore more likely to be in ready state before updating
       heat_template1[:template][:description] = 'Updated test template'
-      data_heat_template1 = Misty.to_json(heat_template1)
+      data_heat_template1 = Misty::Helper.to_json(heat_template1)
       response = cloud.orchestration.update_stack('test_stack1', id1, data_heat_template1)
       response.code.must_equal '202'
 
       # PATCH with URI values
-      data = Misty.to_json('disable_rollback': false)
+      data = Misty::Helper.to_json('disable_rollback': false)
       response = cloud.orchestration.update_stack_patch('test_stack1', id1, data)
       response.code.must_equal '202'
 

data/test/unit/auth/catalog_test.rb

@@ -0,0 +1,99 @@
+require 'test_helper'
+
+describe Misty::Auth::Catalog::V3 do
+  let(:payload) do
+    [{'endpoints' => [
+        {'region_id' => 'regionOne',
+         'url'       => 'http://localhost:8080/v1',
+         'region'    => 'regionOne',
+         'interface' => 'internal',
+         'id'        => 'id_endpoint1_internal'},
+        {'region_id' => 'regionOne',
+          'url'       => 'http://localhost:8081/v1',
+          'region'    => 'regionOne',
+          'interface' => 'public',
+          'id'        => 'id_endpoint1_public' },
+         {'region_id' => 'regionOne',
+          'url'       => 'http://localhost:8082/v1',
+          'region'    => 'regionOne',
+          'interface' => 'admin',
+          'id'        => 'id_endpoint1_admin' }],
+      'type'      => 'v3_service1',
+      'id'        => 'id_endpoint1',
+      'name'      => 'alias1' }]
+  end
+
+  describe '#new' do
+    it 'successful' do
+      catalog = Misty::Auth::Catalog::V3.new(payload)
+      catalog.get_endpoint_url('v3_service1', 'regionOne', 'admin').must_equal 'http://localhost:8082/v1'
+    end
+  end
+
+  describe 'fails' do
+    it 'with unmatched service type' do
+      catalog = Misty::Auth::Catalog::V3.new(payload)
+      proc do
+        catalog.get_endpoint_url('service', 'regionOther', 'nadmin')
+        end.must_raise Misty::Auth::Catalog::ServiceTypeError
+    end
+
+    it 'with unmatched region' do
+      catalog = Misty::Auth::Catalog::V3.new(payload)
+      proc do
+        catalog.get_endpoint_url('v3_service1', 'regionOther', 'admin')
+      end.must_raise Misty::Auth::Catalog::EndpointError
+    end
+
+    it 'with unmatched interface' do
+      catalog = Misty::Auth::Catalog::V3.new(payload)
+      proc do
+        catalog.get_endpoint_url('v3_service1', 'regionOne', 'private')
+      end.must_raise Misty::Auth::Catalog::EndpointError
+    end
+  end
+end
+
+describe Misty::Auth::Catalog::V2 do
+  let(:payload) do
+    [{ 'endpoints' =>
+      [{ 'adminURL' => 'http://localhost',
+        'region' => 'regionTwo',
+        'internalURL' => 'http://localhost:8888/v2.0',
+        'id' => 'id_endpoints',
+        'publicURL' => 'http://localhost' }],
+        'endpoints_links' => [],
+        'type' => 'v2_service1',
+        'name' => 'aliasv2' }]
+  end
+
+  describe '#new' do
+    it 'success' do
+      catalog = Misty::Auth::Catalog::V2.new(payload)
+      catalog.get_endpoint_url('v2_service1', 'regionTwo', 'internal').must_equal 'http://localhost:8888/v2.0'
+    end
+
+    describe 'fails' do
+      it 'with unmatched arguments' do
+        catalog = Misty::Auth::Catalog::V2.new(payload)
+        proc do
+          catalog.get_endpoint_url('test', 'regionOther', 'nadmin')
+        end.must_raise Misty::Auth::Catalog::ServiceTypeError
+      end
+
+      it 'with unmatched region' do
+        catalog = Misty::Auth::Catalog::V2.new(payload)
+        proc do
+          catalog.get_endpoint_url('v2_service1','regionOther', 'admin')
+        end.must_raise Misty::Auth::Catalog::EndpointError
+      end
+
+      it 'with unmatched interface' do
+        catalog = Misty::Auth::Catalog::V2.new(payload)
+        proc do
+          catalog.get_endpoint_url('v2_service1','regionTwo', 'private')
+        end.must_raise Misty::Auth::Catalog::EndpointError
+      end
+    end
+  end
+end