openstack 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17681562cf42cf5718e2a958b88b9506b122b8f1
-  data.tar.gz: 0cbe0dee7b6bc35079a2d7292a95640f8db18c77
+  metadata.gz: d2b9b389dd69f7b30c4c8e6d768efddf46eab2ff
+  data.tar.gz: 8a05757ddcf7e92309e683fbfeb4b51d8b78a801
 SHA512:
-  metadata.gz: 8d6e9528a0fb31296cf2680d7d5168e0f9c271163b9d448b09ba6504cb60abe910ae007c0ed4bd7b921c72d259eec7ad406bc0eb7127d225a982d259b9973219
-  data.tar.gz: 3ba91eab865e7e3bbb8cb002b0e7bb02ef57f5170fa03c24bd37964a7598c3e5c8559cef43d627068f9d967b9ff8efd0fc53adf3ed4657d5eaa198b298c3e673
+  metadata.gz: b33d3daac576ad9a8ed72b11e4314921333d09d555915109956ace1a19e33b369a577e2502aca7affeca78353cb02ce8f4bacce294f7fc857f4487d95a00da93
+  data.tar.gz: fd724c40e74c163f56fdaeb3fcd9816bd07c2d6cf543cd53d636769c532047c83eba5fb2332348016a4709035445dc475c2f5bb2b8e380bbe0e2e0dbb359c1cb

data/VERSION

@@ -1 +1 @@
-3.3.2
+3.3.3

data/lib/openstack/compute/server.rb

@@ -347,6 +347,62 @@ module Compute
       true
     end
 
+    # Sends an API request to rescue this server.
+    #
+    # Returns true if the API call succeeds.
+    #
+    #   >> server.rescue
+    #   => true
+    def rescue(options = nil)
+      data = JSON.generate(:rescue => options)
+      response = @compute.connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/action",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      true
+    end
+
+    # Sends an API request to unrescue this server.
+    #
+    # Returns true if the API call succeeds.
+    #
+    #   >> server.unrescue
+    #   => true
+    def unrescue
+      data = JSON.generate(:unrescue => nil)
+      response = @compute.connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/action",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      true
+    end
+
+    # Add a fixed ip from a specific network to the instance
+    #
+    # Returns true if the API call succeeds.
+    #
+    #   >> server.add_fixed_ip
+    #   => true
+    def add_fixed_ip(network_id)
+      data = JSON.generate(:addFixedIp => {
+          :networkId => network_id
+      })
+      response = @compute.connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/action",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      true
+    end
+
+    # Remove a specific fixed ip from the instance
+    #
+    # Returns true if the API call succeeds.
+    #
+    #   >> server.remove_fixed_ip
+    #   => true
+    def remove_fixed_ip(ip)
+      data = JSON.generate(:removeFixedIp => {
+          :address => ip
+      })
+      response = @compute.connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/action",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      true
+    end
+
     # Lists all interfaces from this server.
     #
     #   >> server.interface_list

data/lib/openstack/identity/connection.rb

@@ -1,3 +1,6 @@
+require 'openstack/identity/connection_v2'
+require 'openstack/identity/connection_v3'
+
 module OpenStack
   module Identity
     class Connection
@@ -6,31 +9,7 @@ module OpenStack
       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
+        extend @connection.auth_path.match(/v3/) ? OpenStack::Identity::ConnectionV3 : OpenStack::Identity::ConnectionV2
       end
 
       def list_users
@@ -40,30 +19,10 @@ module OpenStack
       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/connection_v2.rb

@@ -0,0 +1,57 @@
+module OpenStack
+  module Identity
+    module ConnectionV2
+      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
+
+      # 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
+
+      # update_user(1, {name: 'user1', password: 'password1', email: 'email@mail.ru'})
+      def update_user(user_id, options)
+        req_body = JSON.generate('user' => options)
+        response = @connection.req('PUT', "/users/#{user_id}", data: req_body)
+        OpenStack::Identity::User.new(JSON.parse(response.body)['user'])
+      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/connection_v3.rb

@@ -0,0 +1,58 @@
+module OpenStack
+  module Identity
+    module ConnectionV3
+      def list_tenants
+        response = @connection.req('GET', '/projects')
+        tenants_hash = JSON.parse(response.body)['projects']
+        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)
+        options.merge!(domain_id: @connection.domain_id)
+        req_body = JSON.generate('project' => options)
+        response = @connection.req('POST', '/projects', data: req_body)
+        OpenStack::Identity::Tenant.new(JSON.parse(response.body)['project'])
+      end
+
+      def find_tenant_by_name(name)
+        response = @connection.req('GET', "/projects?name=#{name}")
+        OpenStack::Identity::Tenant.new(JSON.parse(response.body)['project'])
+      end
+
+      def delete_tenant(id)
+        @connection.req('DELETE', "/projects/#{id}")
+        true
+      end
+
+      # create_user(name: 'user1', password: 'password1', email: 'email@mail.ru')
+      #
+      def create_user(options)
+        options.merge!(domain_id: @connection.domain_id)
+        req_body = JSON.generate('user' => options)
+        response = @connection.req('POST', '/users', data: req_body)
+        OpenStack::Identity::User.new(JSON.parse(response.body)['user'])
+      end
+
+      # update_user(1, {name: 'user1', password: 'password1', email: 'email@mail.ru'})
+      def update_user(user_id, options)
+        req_body = JSON.generate('user' => options)
+        response = @connection.req('PATCH', "/users/#{user_id}", data: req_body)
+        OpenStack::Identity::User.new(JSON.parse(response.body)['user'])
+      end
+
+      def add_user_to_tenant(options)
+        @connection.req('PUT', "/projects/#{options[:tenant_id]}/users/#{options[:user_id]}/roles/#{options[:role_id]}")
+        true
+      end
+
+      def list_roles
+        response = @connection.req('GET', '/roles')
+        OpenStack.symbolize_keys(JSON.parse(response.body)['roles'])
+      end
+      alias_method :roles, :list_roles
+    end
+  end
+end

data/lib/openstack/swift/connection.rb

@@ -169,7 +169,7 @@ module Swift
     end
 
     #for ruby 2.x
-    def read(length, buffer=nil)
+    def read(length=nil, buffer=nil)
       if buffer.nil?
         chunk = @file.read(length)
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Dan Prince
@@ -98,6 +98,8 @@ files:
 - lib/openstack/connection.rb
 - lib/openstack/core_ext/to_query.rb
 - lib/openstack/identity/connection.rb
+- lib/openstack/identity/connection_v2.rb
+- lib/openstack/identity/connection_v3.rb
 - lib/openstack/identity/tenant.rb
 - lib/openstack/identity/user.rb
 - lib/openstack/image/connection.rb
@@ -136,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: OpenStack Ruby API