misty 1.1.0 → 1.2.0

data/lib/misty/openstack/ceilometer/ceilometer_v2.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::CeilometerV2
-  def v2
+  def api
 {"/v2/resources"=>{:GET=>[:list_resources]},
  "/v2/resources/{resource_id}"=>{:GET=>[:show_ressource]},
  "/v2/meters"=>{:GET=>[:list_meters]},

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

@@ -1,17 +1,14 @@
-require 'misty/http/client'
 require 'misty/openstack/ceilometer/ceilometer_v2'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Ceilometer
-      class V2 < Misty::HTTP::Client
-        extend Misty::Openstack::CeilometerV2
+      class V2
+        include Misty::Openstack::CeilometerV2
+        include Misty::ClientPack
 
-        def self.api
-          v2
-        end
-
-        def self.service_names
+        def service_names
           %w{metering}
         end
       end

data/lib/misty/openstack/cinder/cinder_v1.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::CinderV1
-  def v1
+  def api
 {"/v1/{admin_tenant_id}/os-quota-sets/{tenant_id}/detail/{user_id}"=>
   {:GET=>[:show_quota_details_for_user_v1]},
  "/v1/{tenant_id}/os-quota-sets/defaults"=>{:GET=>[:show_default_quotas]},

data/lib/misty/openstack/cinder/cinder_v2.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::CinderV2
-  def v2
+  def api
 {"/"=>{:GET=>[:list_api_versions]},
  "/v2/{tenant_id}/backups/detail"=>{:GET=>[:list_backups_with_details]},
  "/v2/{tenant_id}/backups/{backup_id}"=>

data/lib/misty/openstack/cinder/cinder_v3.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::CinderV3
-  def v3
+  def api
 {"/"=>{:GET=>[:list_all_api_versions]},
  "/v3"=>{:GET=>[:show_api_v3_details]},
  "/v3/{project_id}/extensions"=>{:GET=>[:list_known_api_extensions]},

data/lib/misty/openstack/cinder/v1.rb

@@ -1,21 +1,18 @@
-require 'misty/http/client'
 require 'misty/openstack/cinder/cinder_v1'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Cinder
-      class V1 < Misty::HTTP::Client
-        extend Misty::Openstack::CinderV1
+      class V1
+        include Misty::Openstack::CinderV1
+        include Misty::ClientPack
 
-        def self.api
-          v1
-        end
-
-        def self.prefix_path_to_ignore
+        def prefix_path_to_ignore
           '/v1/{admin_tenant_id}/'
         end
 
-        def self.service_names
+        def service_names
           %w{block-storage, block-store, volume}
         end
       end

data/lib/misty/openstack/cinder/v2.rb

@@ -1,21 +1,18 @@
-require 'misty/http/client'
 require 'misty/openstack/cinder/cinder_v2'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Cinder
-      class V2 < Misty::HTTP::Client
-        extend Misty::Openstack::CinderV2
+      class V2
+        include Misty::Openstack::CinderV2
+        include Misty::ClientPack
 
-        def self.api
-          v2
-        end
-
-        def self.prefix_path_to_ignore
+        def prefix_path_to_ignore
           '/v2/{tenant_id}'
         end
 
-        def self.service_names
+        def service_names
           %w{block-storage, block-store, volume}
         end
       end

data/lib/misty/openstack/cinder/v3.rb

@@ -1,23 +1,20 @@
-require 'misty/http/client'
-require 'misty/microversion'
 require 'misty/openstack/cinder/cinder_v3'
+require 'misty/client_pack'
+require 'misty/microversion'
 
 module Misty
   module Openstack
     module Cinder
-      class V3 < Misty::HTTP::Client
-        extend Misty::Openstack::CinderV3
+      class V3
+        include Misty::Openstack::CinderV3
+        include Misty::ClientPack
         include Misty::Microversion
 
-        def self.api
-          v3
-        end
-
-        def self.prefix_path_to_ignore
+        def prefix_path_to_ignore
           '/v3/{tenant_id}'
         end
 
-        def self.service_names
+        def service_names
           %w{block-storage, block-store, volume}
         end
       end

data/lib/misty/openstack/designate/designate_v2.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::DesignateV2
-  def v2
+  def api
 {"/"=>{:GET=>[:list_all_api_versions]},
  "/v2/zones"=>{:POST=>[:create_zone], :GET=>[:list_zones]},
  "/v2/zones/{zone_id}"=>

data/lib/misty/openstack/designate/v2.rb

@@ -1,17 +1,14 @@
-require 'misty/http/client'
 require 'misty/openstack/designate/designate_v2'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Designate
-      class V2 < Misty::HTTP::Client
-        extend Misty::Openstack::DesignateV2
+      class V2
+        include Misty::Openstack::DesignateV2
+        include Misty::ClientPack
 
-        def self.api
-          v2
-        end
-
-        def self.service_names
+        def service_names
           %w{dns}
         end
       end

data/lib/misty/openstack/extension.rb

@@ -0,0 +1,33 @@
+module Misty
+  module Openstack
+    module Extension
+      def api
+        @api_fusion ||= begin
+          list = super
+          api_ext.each do |key, value|
+            if list.include?(key)
+              target = list[key]
+              value.each do |verb, methods|
+                if target.has_key?(verb)
+                  # Add methods to existing Verb
+                  methods.each do |method|
+                    raise RuntimeError, "#{key} => #{verb} already includes: #{method}" if target[verb].include?(method)
+                    target[verb] << method
+                  end
+                else
+                  # Add Verb
+                  target.merge!(verb => methods)
+                end
+              end
+            else
+              # Add Resource
+              list.merge!(key => value)
+            end
+          end
+          list
+        end
+        @api_fusion
+      end
+    end
+  end
+end

data/lib/misty/openstack/freezer/freezer_v1.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::FreezerV1
-  def v1
+  def api
 {"/v1/backups"=>{:GET=>[:lists_backups]},
  "/v1/backups/{backup_id}"=>
   {:GET=>[:show_backups], :DELETE=>[:delete_backups]},

data/lib/misty/openstack/freezer/v1.rb

@@ -1,17 +1,14 @@
-require 'misty/http/client'
 require 'misty/openstack/freezer/freezer_v1'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Freezer
-      class V1 < Misty::HTTP::Client
-        extend Misty::Openstack::FreezerV1
+      class V1
+        include Misty::Openstack::FreezerV1
+        include Misty::ClientPack
 
-        def self.api
-          v1
-        end
-
-        def self.service_names
+        def service_names
           %w{backup}
         end
       end

data/lib/misty/openstack/glance/glance_v1.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::GlanceV1
-  def v1
+  def api
 {"/v1/images"=>{:POST=>[:create_image], :GET=>[:list_images]},
  "/v1/images/detail"=>{:GET=>[:list_images_with_details]},
  "/v1/images/{image_id}"=>

data/lib/misty/openstack/glance/glance_v2.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::GlanceV2
-  def v2
+  def api
 {"/v2/images"=>{:POST=>[:create_an_image], :GET=>[:show_images]},
  "/v2/images/{image_id}"=>
   {:GET=>[:show_image_details],

data/lib/misty/openstack/glance/v1.rb

@@ -1,17 +1,14 @@
-require 'misty/http/client'
 require 'misty/openstack/glance/glance_v1'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Glance
-      class V1 < Misty::HTTP::Client
-        extend Misty::Openstack::GlanceV1
+      class V1
+        include Misty::Openstack::GlanceV1
+        include Misty::ClientPack
 
-        def self.api
-          v1
-        end
-
-        def self.service_names
+        def service_names
           %w{image}
         end
       end

data/lib/misty/openstack/glance/v2.rb

@@ -1,17 +1,14 @@
-require 'misty/http/client'
 require 'misty/openstack/glance/glance_v2'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Glance
-      class V2 < Misty::HTTP::Client
-        extend Misty::Openstack::GlanceV2
+      class V2
+        include Misty::Openstack::GlanceV2
+        include Misty::ClientPack
 
-        def self.api
-          v2
-        end
-
-        def self.service_names
+        def service_names
           %w{image}
         end
       end

data/lib/misty/openstack/heat/heat_v1.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::HeatV1
-  def v1
+  def api
 {"/v1/{tenant_id}/build_info"=>{:GET=>[:show_build_information]},
  "/"=>{:GET=>[:list_versions]},
  "/v1/{tenant_id}/stacks"=>

data/lib/misty/openstack/heat/v1.rb

@@ -1,21 +1,18 @@
-require 'misty/http/client'
 require 'misty/openstack/heat/heat_v1'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Heat
-      class V1 < Misty::HTTP::Client
-        extend Misty::Openstack::HeatV1
+      class V1
+        include Misty::Openstack::HeatV1
+        include Misty::ClientPack
 
-        def self.api
-          v1
-        end
-
-        def self.prefix_path_to_ignore
+        def prefix_path_to_ignore
           '/v1/{tenant_id}'
         end
 
-        def self.service_names
+        def service_names
           %w{orchestration}
         end
       end

data/lib/misty/openstack/ironic/ironic_v1.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::IronicV1
-  def v1
+  def api
 {"/"=>{:GET=>[:list_api_versions]},
  "/v1/"=>{:GET=>[:show_v1_api]},
  "/v1/nodes"=>{:POST=>[:create_node], :GET=>[:list_nodes]},

data/lib/misty/openstack/ironic/v1.rb

@@ -1,19 +1,16 @@
-require 'misty/http/client'
-require 'misty/microversion'
 require 'misty/openstack/ironic/ironic_v1'
+require 'misty/client_pack'
+require 'misty/microversion'
 
 module Misty
   module Openstack
     module Ironic
-      class V1 < Misty::HTTP::Client
-        extend Misty::Openstack::IronicV1
+      class V1
+        include Misty::Openstack::IronicV1
+        include Misty::ClientPack
         include Misty::Microversion
 
-        def self.api
-          v1
-        end
-
-        def self.service_names
+        def service_names
           %w{baremetal}
         end
       end

data/lib/misty/openstack/karbor/karbor_v1.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::KarborV1
-  def v1
+  def api
 {"/v1/{tenant_id}/protectables"=>{:GET=>[:list_protectable_types]},
  "/v1/{tenant_id}/protectables/{protectable_type}"=>
   {:GET=>[:show_protectable_type]},

data/lib/misty/openstack/karbor/v1.rb

@@ -1,17 +1,14 @@
-require 'misty/http/client'
 require 'misty/openstack/karbor/karbor_v1'
+require 'misty/client_pack'
 
 module Misty
   module Openstack
     module Karbor
-      class V1 < Misty::HTTP::Client
-        extend Misty::Openstack::KarborV1
+      class V1
+        include Misty::Openstack::KarborV1
+        include Misty::ClientPack
 
-        def self.api
-          v1
-        end
-
-        def self.service_names
+        def service_names
           %w{data-protection data-protection-orchestration}
         end
       end

data/lib/misty/openstack/keystone/keystone_v2_0.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::KeystoneV2_0
-  def v2_0
+  def api
 {"/v2.0/extensions/{alias}"=>{:GET=>[:show_extension_details]},
  "/v2.0/extensions"=>{:GET=>[:list_extensions]},
  "/v2.0/tenants"=>{:GET=>[:list_tenants]},

data/lib/misty/openstack/keystone/keystone_v2_0_ext.rb

@@ -1,5 +1,5 @@
-module Misty::Openstack::KeystoneV2_0
-  def v2_0_ext
+module Misty::Openstack::KeystoneV2_0_ext
+  def api_ext
 {"/v2.0/users/{user_id}/OS-KSADM/enabled"=>{:PUT=>[:enable_disable_user]},
  "/v2.0/users/{user_id}/OS-KSADM/password"=>{:PUT=>[:set_user_password]},
  "/v2.0/users/{user_id}/OS-KSADM/tenant"=>{:PUT=>[:update_user_tenant]},

data/lib/misty/openstack/keystone/keystone_v3.rb

@@ -1,5 +1,5 @@
 module Misty::Openstack::KeystoneV3
-  def v3
+  def api
 {"/v3/auth/tokens"=>
   {:POST=>
     [:password_authentication_with_unscoped_authorization,

data/lib/misty/openstack/keystone/keystone_v3_ext.rb

@@ -1,5 +1,5 @@
-module Misty::Openstack::KeystoneV3
-  def v3_ext
+module Misty::Openstack::KeystoneV3_ext
+  def api_ext
 {"/v3/policies/{policy_id}/OS-ENDPOINT-POLICY/endpoints/{endpoint_id}"=>
   {:PUT=>[:associate_policy_and_endpoint],
    :GET=>[:verify_a_policy_and_endpoint_association],

data/lib/misty/openstack/keystone/v2_0.rb

@@ -1,20 +1,18 @@
-require 'misty/http/client'
 require 'misty/openstack/keystone/keystone_v2_0'
 require 'misty/openstack/keystone/keystone_v2_0_ext'
+require 'misty/client_pack'
+require 'misty/openstack/extension'
 
 module Misty
   module Openstack
     module Keystone
-      class V2_0 < Misty::HTTP::Client
-        extend Misty::Openstack::KeystoneV2_0
+      class V2_0
+        include Misty::Openstack::KeystoneV2_0
+        include Misty::Openstack::KeystoneV2_0_ext
+        include Misty::ClientPack
+        include Misty::Openstack::Extension
 
-        def self.api
-          api = v2_0
-          api.merge!(v2_0_ext)
-          api
-        end
-
-        def self.service_names
+        def service_names
           %w{identity}
         end
       end