openstack 1.1.2 → 2.0.2

data/lib/openstack/connection.rb

@@ -22,11 +22,14 @@ class Connection
     attr_reader   :service_type
     attr_reader   :proxy_host
     attr_reader   :proxy_port
+    attr_reader   :ca_cert
+    attr_reader   :ssl_version
     attr_reader   :region
     attr_reader   :regions_list #e.g. os.connection.regions_list == {"region-a.geo-1" => [ {:service=>"object-store", :versionId=>"1.0"}, {:service=>"identity", :versionId=>"2.0"}], "region-b.geo-1"=>[{:service=>"identity", :versionId=>"2.0"}] }
 
     attr_reader   :http
     attr_reader   :is_debug
+    attr_reader   :endpoint_type
 
     # Creates and returns a new Connection object, depending on the service_type
     # passed in the options:
@@ -52,6 +55,9 @@ class Connection
     #   :retry_auth - Whether to retry if your auth token expires (defaults to true)
     #   :proxy_host - If you need to connect through a proxy, supply the hostname here
     #   :proxy_port - If you need to connect through a proxy, supply the port here
+    #   :ca_cert - path to a CA chain in PEM format
+    #   :ssl_version - explicitly set an version (:SSLv3 etc, see  OpenSSL::SSL::SSLContext::METHODS)
+    #   :is_debug - Only for development purpose for debug output
     #
     # The options hash is used to create a new OpenStack::Connection object
     # (private constructor) and this is passed to the constructor of OpenStack::Compute::Connection
@@ -72,6 +78,8 @@ class Connection
           OpenStack::Image::Connection.new(connection)
         when "network"
           OpenStack::Network::Connection.new(connection)
+        when "identity"
+          OpenStack::Identity::Connection.new(connection)
        else
           raise Exception::InvalidArgument, "Invalid :service_type parameter: #{@service_type}"
       end
@@ -105,9 +113,12 @@ class Connection
       @retry_auth = options[:retry_auth]
       @proxy_host = options[:proxy_host]
       @proxy_port = options[:proxy_port]
+      @ca_cert = options[:ca_cert]
+      @ssl_version = options[:ssl_version]
       @authok = false
       @http = {}
       @quantum_version = 'v2.0' if @service_type == 'network'
+      @endpoint_type = options[:endpoint_type] || "publicURL"
     end
 
     #specialised from of csreq for PUT object... uses body_stream if possible
@@ -155,7 +166,6 @@ class Connection
 
     # This method actually makes the HTTP REST calls out to the server
     def csreq(method,server,path,port,scheme,headers = {},data = nil,attempts = 0, &block) # :nodoc:
-
       tries = @retries
       time = 3
 
@@ -173,7 +183,7 @@ class Connection
         response = @http[server].request(request)
       end
       if @is_debug
-          puts "REQUEST: #{method} => #{path}"
+          puts "REQUEST: #{auth_method} => #{path}"
           puts data if data
           puts "RESPONSE: #{response.body}"
           puts '----------------------------------------'
@@ -232,6 +242,15 @@ class Connection
           if scheme == "https"
             @http[server].use_ssl = true
             @http[server].verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+            # use the ca_cert if were given one, and make sure we verify!
+            if ! @ca_cert.nil?
+              @http[server].ca_file = @ca_cert
+              @http[server].verify_mode = OpenSSL::SSL::VERIFY_PEER
+            end
+
+            # explicitly set the SSL version to use
+            @http[server].ssl_version= @ssl_version if ! @ssl_version.nil?
           end
           @http[server].start
         rescue
@@ -280,6 +299,15 @@ class AuthV20
       if connection.auth_scheme == "https"
         server.use_ssl = true
         server.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+        # use the ca_cert if were given one, and make sure we verify!
+        if !connection.ca_cert.nil?
+          server.ca_file = connection.ca_cert
+          server.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+
+        # explicitly set the SSL version to use
+        server.ssl_version = connection.ssl_version if !connection.ssl_version.nil?
       end
       server.start
     rescue
@@ -324,23 +352,23 @@ class AuthV20
           if connection.region
             endpoints.each do |ep|
               if ep["region"] and ep["region"].upcase == connection.region.upcase
-                @uri = URI.parse(ep["publicURL"])
+                @uri = URI.parse(ep[connection.endpoint_type])
               end
             end
           else
-            @uri = URI.parse(endpoints[0]["publicURL"])
+            @uri = URI.parse(endpoints[0][connection.endpoint_type])
           end
           if @uri == ""
             raise OpenStack::Exception::Authentication, "No API endpoint for region #{connection.region}"
           else
             if @version #already got one version of endpoints
-              current_version = get_version_from_response(service)
+              current_version = get_version_from_response(service,connection.endpoint_type)
               if @version.to_f > current_version.to_f
                 next
               end
             end
             #grab version to check next time round for multi-version deployments
-            @version = get_version_from_response(service)
+            @version = get_version_from_response(service,connection.endpoint_type)
             connection.service_host = @uri.host
             connection.service_path = @uri.path
             connection.service_port = @uri.port
@@ -356,8 +384,8 @@ class AuthV20
     server.finish if server.started?
   end
 
-  def get_version_from_response(service)
-    service["endpoints"].first["versionId"] || parse_version_from_endpoint(service["endpoints"].first["publicURL"])
+  def get_version_from_response(service,endpoint_type)
+    service["endpoints"].first["versionId"] || parse_version_from_endpoint(service["endpoints"].first[endpoint_type])
   end
 
   #IN  --> https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/46871569847393
@@ -381,6 +409,15 @@ class AuthV10
       if connection.auth_scheme == "https"
         server.use_ssl = true
         server.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+        # use the ca_cert if were given one, and make sure to verify!
+        if !connection.ca_cert.nil?
+          server.ca_file = connection.ca_cert
+          server.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+
+        # explicitly set the SSL version to use
+        server.ssl_version = connection.ssl_version if !connection.ssl_version.nil?
       end
       server.start
     rescue

data/lib/openstack/core_ext/to_query.rb

@@ -0,0 +1,84 @@
+require 'cgi'
+
+class Object
+  # Alias of <tt>to_s</tt>.
+  def to_param
+    to_s
+  end
+
+  # Converts an object into a string suitable for use as a URL query string,
+  # using the given <tt>key</tt> as the param name.
+  def to_query(key)
+    "#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
+  end
+end
+
+class NilClass
+  # Returns +self+.
+  def to_param
+    self
+  end
+end
+
+class TrueClass
+  # Returns +self+.
+  def to_param
+    self
+  end
+end
+
+class FalseClass
+  # Returns +self+.
+  def to_param
+    self
+  end
+end
+
+class Array
+  # Calls <tt>to_param</tt> on all its elements and joins the result with
+  # slashes. This is used by <tt>url_for</tt> in Action Pack.
+  def to_param
+    collect(&:to_param).join '/'
+  end
+
+  # Converts an array into a string suitable for use as a URL query string,
+  # using the given +key+ as the param name.
+  #
+  #   ['Rails', 'coding'].to_query('hobbies') # => "hobbies%5B%5D=Rails&hobbies%5B%5D=coding"
+  def to_query(key)
+    prefix = "#{key}[]"
+
+    if empty?
+      nil.to_query(prefix)
+    else
+      collect { |value| value.to_query(prefix) }.join '&'
+    end
+  end
+end
+
+class Hash
+  # Returns a string representation of the receiver suitable for use as a URL
+  # query string:
+  #
+  #   {name: 'David', nationality: 'Danish'}.to_query
+  #   # => "name=David&nationality=Danish"
+  #
+  # An optional namespace can be passed to enclose key names:
+  #
+  #   {name: 'David', nationality: 'Danish'}.to_query('user')
+  #   # => "user%5Bname%5D=David&user%5Bnationality%5D=Danish"
+  #
+  # The string pairs "key=value" that conform the query string
+  # are sorted lexicographically in ascending order.
+  #
+  # This method is also aliased as +to_param+.
+  def to_query(namespace = nil)
+    collect do |key, value|
+      unless (value.is_a?(Hash) || value.is_a?(Array)) && value.empty?
+        value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+      end
+    end.compact.sort! * '&'
+  end
+
+  alias_method :to_param, :to_query
+end

data/lib/openstack/identity/connection.rb

@@ -0,0 +1,69 @@
+module OpenStack
+  module Identity
+    class Connection
+      attr_accessor :connection
+
+      def initialize(connection)
+        @connection = connection
+        OpenStack::Authentication.init(@connection)
+      end
+
+      def list_tenants
+        response = @connection.req('GET', '/tenants')
+        tenants_hash = JSON.parse(response.body)['tenants']
+        tenants_hash.map { |res| OpenStack::Identity::Tenant.new(res) }
+      end
+      alias_method :tenants, :list_tenants
+
+      # create_tenant(name: 'tenant1', description: 'description', enabled: true)
+      #
+      def create_tenant(options)
+        req_body = JSON.generate('tenant' => options)
+        response = @connection.req('POST', '/tenants', data: req_body)
+        OpenStack::Identity::Tenant.new(JSON.parse(response.body)['tenant'])
+      end
+
+      def find_tenant_by_name(name)
+        response = @connection.req('GET', "/tenants?name=#{name}")
+        OpenStack::Identity::Tenant.new(JSON.parse(response.body)['tenant'])
+      end
+
+      def delete_tenant(id)
+        @connection.req('DELETE', "/tenants/#{id}")
+        true
+      end
+
+      def list_users
+        response = @connection.req('GET', '/users')
+        users_hash = JSON.parse(response.body)['users']
+        users_hash.map { |res| OpenStack::Identity::User.new(res) }
+      end
+      alias_method :users, :list_users
+
+      # create_user(name: 'user1', password: 'password1', email: 'email@mail.ru')
+      #
+      def create_user(options)
+        req_body = JSON.generate('user' => options)
+        response = @connection.req('POST', '/users', data: req_body)
+        OpenStack::Identity::User.new(JSON.parse(response.body)['user'])
+      end
+
+      def delete_user(id)
+        @connection.req('DELETE', "/users/#{id}")
+        true
+      end
+
+      def add_user_to_tenant(options)
+        req_body = JSON.generate('role' => { 'tenantId' => options[:tenant_id], 'roleId' => options[:role_id] })
+        @connection.req('POST', "/users/#{options[:user_id]}/roleRefs", data: req_body)
+        true
+      end
+
+      def list_roles
+        response = @connection.req('GET', '/OS-KSADM/roles')
+        OpenStack.symbolize_keys(JSON.parse(response.body)['roles'])
+      end
+      alias_method :roles, :list_roles
+    end
+  end
+end

data/lib/openstack/identity/tenant.rb

@@ -0,0 +1,17 @@
+module OpenStack
+  module Identity
+    class Tenant
+      attr_reader :id
+      attr_reader :name
+      attr_reader :description
+      attr_reader :enabled
+
+      def initialize(tenant_info = {})
+        @id = tenant_info['id']
+        @name = tenant_info['name']
+        @description = tenant_info['description']
+        @enabled = tenant_info['enabled']
+      end
+    end
+  end
+end

data/lib/openstack/identity/user.rb

@@ -0,0 +1,19 @@
+module OpenStack
+  module Identity
+    class User
+      attr_reader :id
+      attr_reader :name
+      attr_reader :tenant_id
+      attr_reader :enabled
+      attr_reader :email
+
+      def initialize(tenant_info = {})
+        @id = tenant_info['id']
+        @name = tenant_info['name']
+        @tenant_id = tenant_info['tenant_id']
+        @email = tenant_info['email']
+        @enabled = tenant_info['enabled']
+      end
+    end
+  end
+end

data/lib/openstack/network/network.rb

@@ -1,26 +1,25 @@
 module OpenStack
-module Network
-  class Network
-
-  attr_reader :id
-  attr_reader :name
-  attr_reader :admin_state_up
-  attr_reader :status
-  attr_reader :subnets
-  attr_reader :shared
-  attr_reader :tenant_id
-
-  def initialize(net_info={})
-    @id = net_info["id"]
-    @name = net_info["name"]
-    @admin_state_up = net_info["admin_state_up"]
-    @status = net_info["status"]
-    @subnets = net_info["subnets"]
-    @shared = net_info["shared"]
-    @tenant_id = net_info["tenant_id"]
-  end
+  module Network
+    class Network
+      attr_reader :id
+      attr_reader :name
+      attr_reader :admin_state_up
+      attr_reader :status
+      attr_reader :subnets
+      attr_reader :shared
+      attr_reader :external
+      attr_reader :tenant_id
 
+      def initialize(net_info = {})
+        @id = net_info['id']
+        @name = net_info['name']
+        @admin_state_up = net_info['admin_state_up']
+        @status = net_info['status']
+        @subnets = net_info['subnets']
+        @shared = net_info['shared']
+        @external = net_info['router:external']
+        @tenant_id = net_info['tenant_id']
+      end
+    end
   end
 end
-end
-

data/lib/openstack/network/router.rb

@@ -7,20 +7,18 @@ module Network
     attr_reader :admin_state_up
     attr_reader :status
     attr_reader :external_gateway_info
-    attr_reader :tenant_ip
+    attr_reader :tenant_id
     attr_reader :enable_snat
     attr_reader :admin_state_up
 
     def initialize(router_info={})
       @name = router_info['name']
       @status = router_info['status']
-      @external_geteway_info = router_info['external_gateway_info']
+      @external_gateway_info = router_info['external_gateway_info']
       @admin_state_up = router_info['admin_state_up']
-      @tenant_ip = router_info['tenant_ip']
+      @tenant_id = router_info['tenant_id']
       @id = router_info['id']
       @enable_snat = router_info['enable_snat']
-#      @admin_state_up = router_info['external_gateway_info']['admin_state_up']
-#      @network_id = router_info['external_gateway_info']['network_id']
     end
   end
 end

data/lib/openstack/swift/connection.rb

@@ -73,7 +73,7 @@ module Swift
     #   cf.containers(2,'cftest')
     #   => ["test", "video"]
     def containers(limit = nil, marker = nil)
-      path = OpenStack.get_query_params({:limit=>limit, :marker=>marker}, [:limit, :marker], "")
+      path = OpenStack.get_query_params({:limit=>limit, :marker=>marker, :format=>'json'}, [:limit, :marker, :format], "")
       response = @connection.req("GET", URI.encode(path))
       OpenStack.symbolize_keys(JSON.parse(response.body)).inject([]){|res,cur| res << cur[:name]; res }
     end
@@ -89,7 +89,7 @@ module Swift
     #   => { "container1" => { :bytes => "36543", :count => "146" },
     #        "container2" => { :bytes => "105943", :count => "25" } }
     def containers_detail(limit = nil, marker = nil)
-      path = OpenStack.get_query_params({:limit=>limit, :marker=>marker}, [:limit, :marker], "")
+      path = OpenStack.get_query_params({:limit=>limit, :marker=>marker, :format=>'json'}, [:limit, :marker, :format], "")
       response = @connection.req("GET", URI.encode(path))
       OpenStack.symbolize_keys(JSON.parse(response.body)).inject({}){|res,current| res.merge!({current[:name]=>{:bytes=>current[:bytes].to_s,:count=>current[:count].to_s}}) ; res }
     end
@@ -168,8 +168,14 @@ module Swift
       @file = data
     end
 
-    def read(foo)
-      @file.read(@size)
+    #for ruby 2.x
+    def read(length, buffer=nil)
+      if buffer.nil?
+        chunk = @file.read(length)
+      else
+        chunk = @file.read(length, buffer)
+      end
+      chunk
     end
 
     def eof!

data/lib/openstack/volume/connection.rb

@@ -88,6 +88,31 @@ module Volume
       true
     end
 
+    # [ {:extra_specs=>{:volume_backend_name=>"volumes-standard"}, :name=>"slow", :id=>"b3a104b6-fe70-4450-8681-e911a153f41f"},
+    #   {:extra_specs=>{:volume_backend_name=>"volumes-speed"}, :name=>"fast", :id=>"0e278952-9baa-4aa8-88a7-fe8387f1d86c"} ]
+    def list_volume_types
+      response = @connection.req('GET', '/types')
+      OpenStack.symbolize_keys(JSON.parse(response.body)['volume_types'])
+    end
+    alias :types :list_volume_types
+
+    # get_quotas(1)
+    # => { "volumes_slow"=>-1, "snapshots_slow"=>-1, "gigabytes_slow"=>-1,
+    #      "volumes_fast"=>-1, "snapshots_fast"=>-1, "gigabytes_fast"=>-1,
+    #      "volumes"=>10, "snapshots"=>10, "gigabytes"=>1001, "id"=>"1"}
+    def get_quotas(tenant_id)
+      response = @connection.req('GET', "/os-quota-sets/#{tenant_id}")
+      JSON.parse(response.body)['quota_set']
+    end
+
+    # quota_set = { gigabytes: 500, gigabytes_slow: 200, gigabytes_fast: 300 }
+    # cinder.update_quotas(1, quota_set)
+    def update_quotas(tenant_id, quota_set)
+      req_body = JSON.generate({'quota_set' => quota_set})
+      response = @connection.req('PUT', "/os-quota-sets/#{tenant_id}", data: req_body)
+      JSON.parse(response.body)['quota_set']
+    end
+
     private
 
     #fudge... not clear if volumes support is available as 'native' volume API or