misty 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1677bc6d745dc6d7e0fd3623c5aad22e833bba31
-  data.tar.gz: 0554f06362e16e60981a6586c548b5ccd3173bce
+  metadata.gz: 90247f6d9f8410d55769850fbb2e2e6332e35e7d
+  data.tar.gz: 73c5cb98cf6826bfe7256e90e592498b25ab9500
 SHA512:
-  metadata.gz: 1cd973ec3cc1f5ea5b9abf0d3abb98c9bb06edd0b7e9f432b87a3c025f0a0d48cb5414863c9fbd628f8cbb54a75cf0f59f4e8c04b0bf53625f981548803836d8
-  data.tar.gz: d331411fea6186a116f35d1ca49103e191e5795d0adec2ab726679b67b58c5f4d70109b1f4a9fd7026d9a27135bada848db2bc16d2b4c498eedbb964c3a75dbb
+  metadata.gz: d0cc5cfae68ecfe28122303f1f7b0a909faf9baf33441db4d85700e2e86c08f68e4dba0465476621a91b63eb1c7d1fe4530b9cf7f4753438c1bdb6b448d1bce5
+  data.tar.gz: bb19851c6bd284bc0ef9d74eb740f84300f714fb33beb6ee16b6f94e3d86630bb59d622270ef3daed9d54753681b8b9cfbb5e3143638f5b0de23ba40b06be5c2

data/README.md

@@ -46,11 +46,11 @@ gem install misty
 require 'misty'
 
 auth_v3 = {
-  :url      => "http://localhost:5000",
-  :user               => "admin",
-  :password           => "secret",
-  :domain             => "default",
-  :project            => "admin",
+  :url      => 'http://localhost:5000',
+  :user               => 'admin',
+  :password           => 'secret',
+  :domain             => 'default',
+  :project            => 'admin',
   :project_domain_id  => 'default'
 }
 
@@ -59,7 +59,7 @@ openstack = Misty::Cloud.new(:auth => auth_v3)
 puts openstack.compute.list_servers.body
 puts openstack.compute.list_flavors.body
 networks = openstack.network.list_networks
-network_id = networks.body["networks"][0]['id']
+network_id = networks.body['networks'][0]['id']
 network = openstack.network.show_network_details(network_id)
 puts network.body
 ```
@@ -76,7 +76,7 @@ Each service name (i.e. `compute`) is the object handling API requests.
 openstack = Misty::Cloud.new(:auth => { ... })
 openstack.compute.list_servers
 openstack.network.list_networks
-openstack.network.create_network("network": {"name": "my-network"})
+openstack.network.create_network('network': {'name': 'my-network'})
 ```
 
 To obtain the list of supported services:
@@ -197,12 +197,12 @@ Keystone v3 is default recommended version:
 
 ```ruby
 auth = {
-  :url            => "http://localhost:5000",
-  :user           => "admin",
-  :user_domain    => "default",
-  :password       => "secret",
-  :project        => "admin",
-  :project_domain => "default"
+  :url            => 'http://localhost:5000',
+  :user           => 'admin',
+  :user_domain    => 'default',
+  :password       => 'secret',
+  :project        => 'admin',
+  :project_domain => 'default'
   }
 }
 ```
@@ -211,10 +211,10 @@ Alternatively, using IDs:
 
 ```ruby
 auth = {
-  :url         => "http://localhost:5000",
-  :user_id    => "48985e6b8da145699d411f12a3459fca",
-  :password   => "secret",
-  :project_id => "8e1e232f6cbb4116bbef715d8a0afe6e",
+  :url         => 'http://localhost:5000',
+  :user_id    => '48985e6b8da145699d411f12a3459fca',
+  :password   => 'secret',
+  :project_id => '8e1e232f6cbb4116bbef715d8a0afe6e',
   }
 }
 ```
@@ -223,10 +223,10 @@ Provide the tenant details, Misty will detect it's using v2.0 for authentication
 
 ```ruby
 auth = {
-  :url      => "http://localhost:5000",
-  :user     => "admin",
-  :password => "secret",
-  :tenant   => "admin",
+  :url      => 'http://localhost:5000',
+  :user     => 'admin',
+  :password => 'secret',
+  :tenant   => 'admin',
 }
 ```
 ### Logging parameters
@@ -300,13 +300,13 @@ The following options are available:
 
 Example:
 ```ruby
-openstack = Misty::Cloud.new(:auth => auth, :log_level => 0, :identity => {:region_id => "regionTwo"}, :compute => {:version => "2.27", :interface => "admin"})
+openstack = Misty::Cloud.new(:auth => auth, :log_level => 0, :identity => {:region_id => 'regionTwo'}, :compute => {:version => '2.27', :interface => 'admin'})
 ```
 
 ## Direct REST HTTP Methods
 To send requests directly use the 'get', 'delete', 'post' and 'put' methods directly:
 ```ruby
-openstack.network.post("/v2.0/qos/policies/48985e6b8da145699d411f12a3459fca/dscp_marking_rules", data)
+openstack.network.post('/v2.0/qos/policies/48985e6b8da145699d411f12a3459fca/dscp_marking_rules', data)
 ```
 # Requirements
 

data/lib/misty/auth.rb

@@ -17,48 +17,53 @@ module Misty
     attr_reader :catalog, :token
 
     def self.factory(auth, config)
-      http = nil
-      unless auth[:context]
-        raise URLError, "No URL provided" unless auth[:url] && !auth[:url].empty?
-        http = Misty::HTTP::NetHTTP.net_http(URI.parse(auth[:url]), config.ssl_verify_mode, config.log)
-      end
-
-      if auth[:tenant_id] || auth[:tenant]
-        return Misty::AuthV2.new(auth, http)
-      else
-        return Misty::AuthV3.new(auth, http)
-      end
+      version = auth[:tenant_id] || auth[:tenant] ? 'V2' : 'V3'
+      klass = Object.const_get("Misty::Auth#{version}")
+      klass.new(auth, config)
     end
 
-    def initialize(auth, http)
+    def initialize(auth, config)
       if auth[:context]
         # bypass the authentication by given token catalog and expire date
         @token   = auth[:context][:token]
         @catalog = auth[:context][:catalog]
         @expires = auth[:context][:expires]
       else
-        @http = http
+        raise URLError, 'No URL provided' if auth[:url].nil? || auth[:url].empty?
+        @uri = URI.parse(auth[:url])
+        @config = config
         # autheticate
         @credentials = set_credentials(auth)
         @token, @catalog, @expires = set(authenticate)
       end
+      #byebug unless config.is_a?(Misty::Cloud::Config)
     end
 
     def authenticate
-      response = @http.post(self.class.path, @credentials.to_json, Misty::HEADER_JSON)
-      raise AuthenticationError, "Response code=#{response.code}, Msg=#{response.msg}" unless response.code =~ /200|201/
-      response
+      Misty::HTTP::NetHTTP.http_request(
+        @uri, ssl_verify_mode: @config.ssl_verify_mode, log: @config.log
+      ) do |connection|
+        response = connection.post(self.class.path, @credentials.to_json,
+                                   Misty::HEADER_JSON)
+        unless response.code =~ /200|201/
+          raise AuthenticationError,
+                "Response code=#{response.code}, Msg=#{response.msg}"
+        end
+        response
+      end
     end
 
     def expired?
-      raise ExpiryError, "Missing token expiration data" if @expires.nil? || @expires.empty?
+      if @expires.nil? || @expires.empty?
+        raise ExpiryError, 'Missing token expiration data'
+      end
       Time.parse(@expires) < Time.now.utc
     end
 
     def get_endpoint(service_names, region, interface)
       @catalog.each do |catalog|
-        if service_names.include? catalog["type"]
-          return catalog_endpoints(catalog["endpoints"], region, interface)
+        if service_names.include? catalog['type']
+          return catalog_endpoints(catalog['endpoints'], region, interface)
         end
       end
       raise CatalogError, "No service found with either #{service_names} name, region #{region}, interface #{interface}"

data/lib/misty/auth/auth_v2.rb

@@ -3,12 +3,12 @@ require 'misty/auth'
 module Misty
   class AuthV2 < Misty::Auth
     def self.path
-      "/v2.0/tokens"
+      '/v2.0/tokens'
     end
 
     def catalog_endpoints(endpoints, region, interface)
       endpoints.each do |endpoint|
-        if endpoint["region"] == region && endpoint["#{interface}URL"]
+        if endpoint['region'] == region && endpoint["#{interface}URL"]
           return endpoint["#{interface}URL"]
         end
       end
@@ -16,28 +16,28 @@ module Misty
 
     def credentials
       if @token
-        identity = { "token": { "id": @token } }
+        identity = { 'token': { 'id': @token } }
       else
         raise Misty::Auth::CredentialsError, "#{self.class}: User name is required" if @user.name.nil?
         raise Misty::Auth::CredentialsError, "#{self.class}: User password is required" if @user.password.nil?
-        identity = { "passwordCredentials": user_credentials }
+        identity = { 'passwordCredentials': user_credentials }
       end
 
       if @tenant.id
-        identity.merge!("tenantId": @tenant.id)
+        identity.merge!('tenantId': @tenant.id)
       elsif @tenant.name
-        identity.merge!("tenantName": @tenant.name)
+        identity.merge!('tenantName': @tenant.name)
       else
         raise Misty::Auth::CredentialsError, "#{self.class}: No tenant available"
       end
 
-      { "auth": identity }
+      { 'auth': identity }
     end
 
     def user_credentials
       {
-        "username": @user.name,
-        "password": @user.password
+        'username': @user.name,
+        'password': @user.password
       }
     end
 
@@ -49,9 +49,9 @@ module Misty
 
     def set(response)
       payload = JSON.load(response.body)
-      token   = payload["access"]["token"]["id"]
-      catalog = payload["access"]["serviceCatalog"]
-      expires = payload["access"]["token"]["expires"]
+      token   = payload['access']['token']['id']
+      catalog = payload['access']['serviceCatalog']
+      expires = payload['access']['token']['expires']
       [token, catalog, expires]
     end
 

data/lib/misty/auth/auth_v3.rb

@@ -3,13 +3,13 @@ require 'misty/auth'
 module Misty
   class AuthV3 < Misty::Auth
     def self.path
-      "/v3/auth/tokens"
+      '/v3/auth/tokens'
     end
 
     def catalog_endpoints(endpoints, region, interface)
       endpoints.each do |endpoint|
-        if endpoint["region_id"] == region && endpoint["interface"] == interface
-          return endpoint["url"]
+        if endpoint['region_id'] == region && endpoint['interface'] == interface
+          return endpoint['url']
         end
       end
     end
@@ -17,27 +17,27 @@ module Misty
     def credentials
       if @token
         identity = {
-          "methods": ["token"],
-          "token": { "id": @token }
+          'methods': ['token'],
+          'token': { 'id': @token }
         }
       else
         identity = {
-          "methods": ["password"],
-          "password": @user.identity
+          'methods': ['password'],
+          'password': @user.identity
         }
       end
       {
-        "auth": {
-          "identity": identity,
-          "scope": scope
+        'auth': {
+          'identity': identity,
+          'scope': scope
         }
       }
     end
 
     def get_endpoint_url(endpoints, region, interface)
-      endpoint = endpoints.select { |ep| ep["region_id"] == region && ep["interface"] == interface }
+      endpoint = endpoints.select { |ep| ep['region_id'] == region && ep['interface'] == interface }
       raise CatalogError, "No endpoint available for region '#{region}' and interface '#{interface}'" unless endpoint
-      endpoint[0]["url"]
+      endpoint[0]['url']
     end
 
     def scope
@@ -48,9 +48,9 @@ module Misty
 
     def set(response)
       payload = JSON.load(response.body)
-      token = response["x-subject-token"]
-      catalog = payload["token"]["catalog"]
-      expires = payload["token"]["expires_at"]
+      token = response['x-subject-token']
+      catalog = payload['token']['catalog']
+      expires = payload['token']['expires_at']
       [token, catalog, expires]
     end
 

data/lib/misty/autoload.rb

@@ -1,99 +1,99 @@
 module Misty
   module Openstack
     module Aodh
-      autoload :V2, "misty/openstack/aodh/v2"
+      autoload :V2, 'misty/openstack/aodh/v2'
     end
 
     module Ceilometer
-      autoload :V2, "misty/openstack/ceilometer/v2"
+      autoload :V2, 'misty/openstack/ceilometer/v2'
     end
 
     module Cinder
-      autoload :V1, "misty/openstack/cinder/v1"
-      autoload :V2, "misty/openstack/cinder/v2"
-      autoload :V3, "misty/openstack/cinder/v3"
+      autoload :V1, 'misty/openstack/cinder/v1'
+      autoload :V2, 'misty/openstack/cinder/v2'
+      autoload :V3, 'misty/openstack/cinder/v3'
     end
 
     module Designate
-      autoload :V2, "misty/openstack/designate/v2"
+      autoload :V2, 'misty/openstack/designate/v2'
     end
 
     module Freezer
-      autoload :V1, "misty/openstack/freezer/v1"
+      autoload :V1, 'misty/openstack/freezer/v1'
     end
 
     module Glance
-      autoload :V1, "misty/openstack/glance/v1"
-      autoload :V2, "misty/openstack/glance/v2"
+      autoload :V1, 'misty/openstack/glance/v1'
+      autoload :V2, 'misty/openstack/glance/v2'
     end
 
     module Heat
-      autoload :V1, "misty/openstack/heat/v1"
+      autoload :V1, 'misty/openstack/heat/v1'
     end
 
     module Ironic
-      autoload :V1, "misty/openstack/ironic/v1"
+      autoload :V1, 'misty/openstack/ironic/v1'
     end
 
     module Karbor
-      autoload :V1, "misty/openstack/karbor/v1"
+      autoload :V1, 'misty/openstack/karbor/v1'
     end
 
     module Keystone
-      autoload :V3,   "misty/openstack/keystone/v3"
-      autoload :V2_0, "misty/openstack/keystone/v2_0"
+      autoload :V3,   'misty/openstack/keystone/v3'
+      autoload :V2_0, 'misty/openstack/keystone/v2_0'
     end
 
     module Magnum
-      autoload :V1, "misty/openstack/magnum/v1"
+      autoload :V1, 'misty/openstack/magnum/v1'
     end
 
     module Manila
-      autoload :V2, "misty/openstack/manila/v2"
+      autoload :V2, 'misty/openstack/manila/v2'
     end
 
     module Murano
-      autoload :V1, "misty/openstack/murano/v1"
+      autoload :V1, 'misty/openstack/murano/v1'
     end
 
     module Neutron
-      autoload :V2_0, "misty/openstack/neutron/v2_0"
+      autoload :V2_0, 'misty/openstack/neutron/v2_0'
     end
 
     module Nova
-      autoload :V2_1, "misty/openstack/nova/v2_1"
+      autoload :V2_1, 'misty/openstack/nova/v2_1'
     end
 
     module Octavia
-      autoload :V2_0, "misty/openstack/octavia/v2_0"
+      autoload :V2_0, 'misty/openstack/octavia/v2_0'
     end
 
     module Sahara
-      autoload :V1_1, "misty/openstack/sahara/v1_1"
+      autoload :V1_1, 'misty/openstack/sahara/v1_1'
     end
 
     module Searchlight
-      autoload :V1, "misty/openstack/searchlight/v1"
+      autoload :V1, 'misty/openstack/searchlight/v1'
     end
 
     module Senlin
-      autoload :V1, "misty/openstack/senlin/v1"
+      autoload :V1, 'misty/openstack/senlin/v1'
     end
 
     module Swift
-      autoload :V1, "misty/openstack/swift/v1"
+      autoload :V1, 'misty/openstack/swift/v1'
     end
 
     module Tacker
-      autoload :V1_0, "misty/openstack/tacker/v1_0"
+      autoload :V1_0, 'misty/openstack/tacker/v1_0'
     end
 
     module Trove
-      autoload :V1_0, "misty/openstack/trove/v1_0"
+      autoload :V1_0, 'misty/openstack/trove/v1_0'
     end
 
     module Zaqar
-      autoload :V2, "misty/openstack/zaqar/v2"
+      autoload :V2, 'misty/openstack/zaqar/v2'
     end
   end
 end

data/lib/misty/cloud.rb

@@ -4,7 +4,7 @@ require 'misty/auth/auth_v3'
 module Misty
   class Cloud
     class Config
-      attr_accessor :auth, :content_type, :interface, :log, :region_id, :ssl_verify_mode
+      attr_accessor :auth, :content_type, :interface, :log, :region_id, :ssl_verify_mode, :headers
     end
 
     attr_reader :auth
@@ -27,6 +27,7 @@ module Misty
       config.log.level = params[:log_level] ? params[:log_level] : Misty::LOG_LEVEL
       config.region_id = params[:region_id] ? params[:region_id] : Misty::REGION_ID
       config.ssl_verify_mode = params.key?(:ssl_verify_mode) ? params[:ssl_verify_mode] : Misty::SSL_VERIFY_MODE
+      config.headers = params[:headers]
       config
     end