misty 1.4.0 → 1.5.1

data/lib/misty/errors.rb

@@ -1,12 +1,25 @@
 module Misty
   module Auth
     class AuthenticationError < StandardError; end
-    class CatalogError        < StandardError; end
-    class TokenError          < StandardError; end
+    class InitError < RuntimeError; end
 
-    class ExpiryError      < RuntimeError; end
-    class InitError        < RuntimeError; end
-    class URLError         < RuntimeError; end
+    module Catalog
+      class EndpointError < StandardError; end
+      class ServiceTypeError < StandardError; end
+    end
+
+    module Token
+      class ExpiryError      < RuntimeError; end
+      class URLError         < RuntimeError; end
+    end
+
+    module V2
+      class CredentialsError < RuntimeError; end
+    end
+
+    module V3
+      class DomainScopeError < RuntimeError; end
+    end
   end
 
   class Config
@@ -14,6 +27,13 @@ module Misty
     class InvalidDataError < StandardError; end
   end
 
+  module HTTP
+    class Header
+      class ArgumentError < RuntimeError; end
+      class TypeError     < RuntimeError; end
+    end
+  end
+
   module Microversion
     class VersionError < RuntimeError; end
   end

data/lib/misty/helper.rb

@@ -0,0 +1,26 @@
+module Misty
+  module Helper
+    def self.json_encode?(data)
+      return true if data.is_a?(Array) || data.is_a?(Hash)
+      if data.is_a?(String)
+        begin
+          JSON.parse(data)
+        rescue JSON::ParserError
+          return false
+        else
+          return true
+        end
+      end
+      return false
+    end
+
+
+    def self.to_json(data)
+      if data.is_a? String
+        JSON.parse(data)
+        return data
+      end
+      return JSON.dump(data)
+    end
+  end
+end

data/lib/misty/http/header.rb

@@ -1,14 +1,11 @@
 module Misty
   module HTTP
     class Header
-      class ArgumentError < RuntimeError; end
-      class TypeError     < RuntimeError; end
-
       def self.valid?(param)
-        raise Misty::HTTP::Header::TypeError unless param.class == Hash
+        raise TypeError unless param.class == Hash
         param.each do |key, val|
-          raise Misty::HTTP::Header::ArgumentError unless key.class == String
-          raise Misty::HTTP::Header::ArgumentError unless val.class == String
+          raise ArgumentError unless key.class == String
+          raise ArgumentError unless val.class == String
         end
         true
       end

data/lib/misty/http/method_builder.rb

@@ -12,9 +12,9 @@ module Misty
       private
 
       def process_data(header, args)
-        if args.size == 1 && Misty.json_encode?(args[0])
+        if args.size == 1 && Misty::Helper.json_encode?(args[0])
           header.add('Content-Type' => 'application/json')
-          return Misty.to_json(args[0])
+          return Misty::Helper.to_json(args[0])
         elsif args.size == 1
           return args[0]
         end

data/lib/misty/http/request.rb

@@ -23,10 +23,10 @@ module Misty
       end
 
       def http(request)
-        request['X-Auth-Token'] = @auth.get_token
+        request['X-Auth-Token'] = @token.get
 
         Misty::HTTP::NetHTTP.http_request(
-          @uri, ssl_verify_mode: @ssl_verify_mode, log: @log
+          @endpoint, ssl_verify_mode: @ssl_verify_mode, log: @log
         ) do |connection|
           response = connection.request(request)
           response.body = JSON.parse(response.body) if decode?(response)
@@ -86,7 +86,7 @@ module Misty
       end
 
       def http_to_s(verb, path, headers, data = nil)
-        log = "HTTP #{verb} base_url='#{@uri.host}:#{@uri.port}', path='#{path}', header=#{headers}"
+        log = "HTTP #{verb} '#{@endpoint.host}:#{@endpoint.port}/#{path}', header=#{headers}"
         log << ", data='#{data}'" if data
         log
       end

data/lib/misty/microversion.rb

@@ -16,11 +16,22 @@ module Misty
     end
 
     def microversion_header(version)
-      {'X-Openstack-API-Version' => "#{service_names[0]} #{version}" }
+      {'X-Openstack-API-Version' => "#{service_types[0]} #{version}" }
     end
 
     private
 
+    def get_microversion
+      project = self.class.to_s.split('::')[-2].downcase.to_sym
+      s = Misty.services.find {|service| service.project == project}
+      raise RuntimeError, 'No microversion found!' unless s&.microversion
+      s.microversion
+    end
+
+    def microversion
+      @microversion ||= get_microversion
+    end
+
     def versions
       @versions ||= versions_fetch
     end

data/lib/misty/misty.rb

@@ -1,70 +1,15 @@
 require 'misty/services'
-require 'logger'
-
-# Misty is a HTTP client for OpenStack APIs, aiming to be fast, flexible and exhaustive.
-# Misty acts as a conduit to OpenStack APIs by handling requests as transparently as possible.
+require 'misty/helper'
+require 'misty/openstack'
 
 module Misty
-  SERVICES = [
-    { name: :application_catalog,                 project: :murano,      versions: ['v1']},
-    { name: :alarming,                            project: :aodh,        versions: ['v2']},
-    { name: :backup,                              project: :freezer,     versions: ['v1']},
-    { name: :baremetal,                           project: :ironic,      versions: ['v1'],             microversion: 'v1'},
-    { name: :block_storage,                       project: :cinder,      versions: ['v3', 'v2', 'v1'], microversion: 'v3'},
-    { name: :clustering,                          project: :senlin,      versions: ['v1']},
-    { name: :compute,                             project: :nova,        versions: ['v2.1'],           microversion: 'v2.1'},
-    { name: :container_infrastructure_management, project: :magnum,      versions: ['v1'],             microversion: 'v1'},
-    { name: :data_processing,                     project: :sahara,      versions: ['v1.1']},
-    { name: :data_protection_orchestration,       project: :karbor,      versions: ['v1']},
-    { name: :database,                            project: :trove,       versions: ['v1.0']},
-    { name: :dns               ,                  project: :designate,   versions: ['v2']},
-    { name: :identity,                            project: :keystone,    versions: ['v3', 'v2.0']},
-    { name: :image,                               project: :glance,      versions: ['v2', 'v1']},
-    { name: :load_balancer,                       project: :octavia,     versions: ['v2.0']},
-    { name: :messaging,                           project: :zaqar,       versions: ['v2']},
-    { name: :metering,                            project: :ceilometer,  versions: ['v2']},
-    { name: :networking,                          project: :neutron,     versions: ['v2.0']},
-    { name: :nfv_orchestration,                   project: :tacker,      versions: ['v1.0']},
-    { name: :object_storage,                      project: :swift,       versions: ['v1']},
-    { name: :orchestration,                       project: :heat,        versions: ['v1']},
-    { name: :search,                              project: :searchlight, versions: ['v1']},
-    { name: :shared_file_systems,                 project: :manila,      versions: ['v2'],             microversion: 'v2'}
-  ]
-
-  # Default Domain ID
-  DOMAIN_ID = 'default'
-
-  def self.json_encode?(data)
-    return true if data.is_a?(Array) || data.is_a?(Hash)
-    if data.is_a?(String)
-      begin
-        JSON.parse(data)
-      rescue JSON::ParserError
-        return false
-      else
-        return true
-      end
-    end
-    return false
+  def self.build(list)
+    services_list = Misty::Services.new
+    list.each  {|s| services_list.add(s)}
+    services_list
   end
 
-  # Provides list of supported services
-  # ==== Example
-  #     pp Misty.services
-
   def self.services
-    services = Misty::Services.new
-    SERVICES.each do |service|
-      services.add(service)
-    end
-    services
-  end
-
-  def self.to_json(data)
-    if data.is_a? String
-      JSON.parse(data)
-      return data
-    end
-    return JSON.dump(data)
+    @services ||= build(Misty::Openstack::SERVICES)
   end
 end

data/lib/misty/openstack.rb

@@ -0,0 +1,39 @@
+module Misty
+  module Openstack
+    SERVICES = [
+      {:type=>:application_catalog, :project=>:murano, :versions=>["v1"]},
+      {:type=>:alarming, :project=>:aodh, :versions=>["v2"]},
+      {:type=>:backup, :project=>:freezer, :versions=>["v1"]},
+      {:type=>:baremetal, :project=>:ironic, :versions=>["v1"], :microversion=>"1.32"},
+      {:type=>:block_storage, :project=>:cinder, :versions=>["v3", "v2", "v1"], :microversion=>"3.44"},
+      {:type=>:clustering, :project=>:senlin, :versions=>["v1"]},
+      {:type=>:compute, :project=>:nova, :versions=>["v2.1"], :microversion=>"2.60"},
+      {:type=>:container_infrastructure_management, :project=>:magnum, :versions=>["v1"], :microversion=>"1.4"},
+      {:type=>:container_service, :project=>:zun, :versions=>["v1"]},
+      {:type=>:data_processing, :project=>:sahara, :versions=>["v1.1"]},
+      {:type=>:data_protection_orchestration, :project=>:karbor, :versions=>["v1"]},
+      {:type=>:database, :project=>:trove, :versions=>["v1.0"]},
+      {:type=>:dns, :project=>:designate, :versions=>["v2"]},
+      {:type=>:event, :project=>:panko, :versions=>["v2"]},
+      {:type=>:identity, :project=>:keystone, :versions=>["v3", "v2.0"]},
+      {:type=>:image, :project=>:glance, :versions=>["v2", "v1"]},
+      {:type=>:instance_ha, :project=>:masakari, :versions=>["v1.0"]},
+      {:type=>:key_manager, :project=>:barbican, :versions=>["v1"]},
+      {:type=>:load_balancer, :project=>:octavia, :versions=>["v2.0"]},
+      {:type=>:metric, :project=>:gnocchi, :versions=>["v1"]},
+      {:type=>:messaging, :project=>:zaqar, :versions=>["v2"]},
+      {:type=>:metering, :project=>:ceilometer, :versions=>["v2"]},
+      {:type=>:monitoring, :project=>:monasca, :versions=>["v2.0"]},
+      {:type=>:network, :project=>:neutron, :versions=>["v2.0"]},
+      {:type=>:nfv_orchestration, :project=>:tacker, :versions=>["v1.0"]},
+      {:type=>:object_storage, :project=>:swift, :versions=>["v1"]},
+      {:type=>:orchestration, :project=>:heat, :versions=>["v1"]},
+      {:type=>:placement, :project=>:placement, :versions=>["v2.1"], :microversion=>"2.60"},
+      {:type=>:reservation, :project=>:blazar, :versions=>["v1"]},
+      {:type=>:resource_optimization, :project=>:watcher, :versions=>["v1"]},
+      {:type=>:search, :project=>:searchlight, :versions=>["v1"]},
+      {:type=>:shared_file_systems, :project=>:manila, :versions=>["v2"], :microversion=>"2.40"},
+      {:type=>:workflow, :project=>:mistral, :versions=>["v2"]}
+    ]
+  end
+end

data/lib/misty/openstack/{aodh → api/aodh}/aodh_v2.rb

@@ -1,4 +1,4 @@
-module Misty::Openstack::AodhV2
+module Misty::Openstack::API::AodhV2
   def tag
     'Alarming API Legacy'
   end

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

@@ -0,0 +1,19 @@
+require 'misty/openstack/api/aodh/aodh_v2'
+require 'misty/openstack/service_pack'
+
+module Misty
+  module Openstack
+    module API
+      module Aodh
+        class V2
+          include Misty::Openstack::API::AodhV2
+          include Misty::Openstack::ServicePack
+
+          def service_types
+            %w(alarming alarm)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/misty/openstack/api/barbican/barbican_v1.rb

@@ -0,0 +1,42 @@
+module Misty::Openstack::API::BarbicanV1
+  def tag
+    'Barbican API'
+  end
+
+  def api
+{"{container_ref}/consumers"=>
+  {:GET=>[:list_container_consumers],
+   :POST=>[:create_consumer],
+   :DELETE=>[:delete_consumer]},
+ "/v1/containers"=>{:GET=>[:list_containers], :POST=>[:create_container]},
+ "/v1/containers/{uuid}"=>
+  {:GET=>[:get_containers], :DELETE=>[:delete_containers]},
+ "/v1/containers/{container_uuid}/secrets"=>
+  {:POST=>[:create_container_secret], :DELETE=>[:delete_container_secret]},
+ "/v1/quotas"=>{:GET=>[:list_quotas]},
+ "/v1/project-quotas"=>{:GET=>[:list_project_quotas]},
+ "/v1/project-quotas/{uuid}"=>
+  {:GET=>[:get_project_quotas],
+   :PUT=>[:create_or_update_project_quotas],
+   :DELETE=>[:delete_project_quotas]},
+ "/v1/secrets/{uuid}/metadata"=>
+  {:GET=>[:list_secret_metadata], :PUT=>[:create_secret_metadata]},
+ "/v1/secrets/{uuid}/metadata/{key}"=>
+  {:GET=>[:get_secret_metadata_key],
+   :PUT=>[:update_secret_metadata_key],
+   :DELETE=>[:delete_secret_metadata]},
+ "/v1/secrets/{uuid}/metadata/"=>{:POST=>[:create_secret_metadata_key]},
+ "/v1/secret-stores"=>{:GET=>[:list_secret_stores]},
+ "/v1/secret-stores/{secret_store_id}"=>{:GET=>[:get_secret_store]},
+ "/v1/secret-stores/preferred"=>{:GET=>[:get_secret_stores_preferred]},
+ "/v1/secret-stores/{secret_store_id}/preferred"=>
+  {:POST=>[:create_secret_stores_preferred],
+   :DELETE=>[:delete_secret_store_preferred]},
+ "/v1/secret-stores/global-default"=>
+  {:GET=>[:get_secret_stores_global_default]},
+ "/v1/secrets"=>{:GET=>[:list_secrets], :POST=>[:update_secrets]},
+ "/v1/secrets/{uuid}"=>
+  {:GET=>[:get_secret], :PUT=>[:create_secret], :DELETE=>[:delete_secret]},
+ "/v1/secrets/{uuid}/payload"=>{:GET=>[:get_secret_payload]}}
+  end
+end

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

@@ -0,0 +1,19 @@
+require 'misty/openstack/api/barbican/barbican_v1'
+require 'misty/openstack/service_pack'
+
+module Misty
+  module Openstack
+    module API
+      module Barbican
+        class V1
+          include Misty::Openstack::API::BarbicanV1
+          include Misty::Openstack::ServicePack
+
+          def service_types
+            %w(key-manager)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/misty/openstack/api/blazar/blazar_v1.rb

@@ -0,0 +1,16 @@
+module Misty::Openstack::API::BlazarV1
+  def tag
+    'Reservation API Reference '
+  end
+
+  def api
+{"v1/leases"=>{:GET=>[:list_leases], :POST=>[:create_lease]},
+ "v1/leases/{lease_id}"=>
+  {:GET=>[:show_lease_details],
+   :PUT=>[:update_lease],
+   :DELETE=>[:delete_lease]},
+ "v1/os_hosts"=>{:GET=>[:list_hosts], :POST=>[:create_host]},
+ "v1/os_hosts/{host_id}"=>
+  {:GET=>[:show_host_details], :PUT=>[:update_host], :DELETE=>[:delete_host]}}
+  end
+end

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

@@ -0,0 +1,19 @@
+require 'misty/openstack/api/blazar/blazar_v1'
+require 'misty/openstack/service_pack'
+
+module Misty
+  module Openstack
+    module API
+      module Blazar
+        class V1
+          include Misty::Openstack::API::BlazarV1
+          include Misty::Openstack::ServicePack
+
+          def service_types
+            %w(reservation)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/misty/openstack/{ceilometer → api/ceilometer}/ceilometer_v2.rb

@@ -1,4 +1,4 @@
-module Misty::Openstack::CeilometerV2
+module Misty::Openstack::API::CeilometerV2
   def tag
     'Metering API Legacy'
   end

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

@@ -0,0 +1,19 @@
+require 'misty/openstack/api/ceilometer/ceilometer_v2'
+require 'misty/openstack/service_pack'
+
+module Misty
+  module Openstack
+    module API
+      module Ceilometer
+        class V2
+          include Misty::Openstack::API::CeilometerV2
+          include Misty::Openstack::ServicePack
+
+          def service_types
+            %w(meter metering telemetry)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/misty/openstack/{cinder → api/cinder}/cinder_v1.rb

@@ -1,4 +1,4 @@
-module Misty::Openstack::CinderV1
+module Misty::Openstack::API::CinderV1
   def tag
     'Block Storage API Legacy'
   end

data/lib/misty/openstack/{cinder → api/cinder}/cinder_v2.rb

@@ -1,4 +1,4 @@
-module Misty::Openstack::CinderV2
+module Misty::Openstack::API::CinderV2
   def tag
     'Block Storage API Reference 12.0.0'
   end
@@ -102,8 +102,8 @@ module Misty::Openstack::CinderV2
    :POST=>[:create_an_encryption_type_for_v2]},
  "/v2/{project_id}/types/{volume_type_id}/encryption/{encryption_id}"=>
   {:GET=>[:delete_an_encryption_type_for_v2],
-   :POST=>[:update_an_encryption_type_for_v2]},
- "/v2"=>{:GET=>[:show_api_v2_details]},
+   :PUT=>[:update_an_encryption_type_for_v2]},
+ "/v2/"=>{:GET=>[:show_api_v2_details]},
  "/v2/{project_id}/volumes/{volume_id}/action"=>
   {:POST=>
     [:extend_volume_size,