openstack 1.1.1 → 1.1.2

data/lib/openstack.rb

@@ -18,7 +18,6 @@
 
 module OpenStack
 
-  VERSION = IO.read(File.dirname(__FILE__) + '/../VERSION')
   require 'net/http'
   require 'net/https'
   require 'uri'
@@ -49,7 +48,9 @@ module OpenStack
   require 'openstack/network/connection'
   require 'openstack/network/network'
   require 'openstack/network/subnet'
+  require 'openstack/network/router'
   require 'openstack/network/port'
+  require 'openstack/version'
   # Constants that set limits on server creation
   MAX_PERSONALITY_ITEMS = 5
   MAX_PERSONALITY_FILE_SIZE = 10240

data/lib/openstack/compute/address.rb

@@ -78,7 +78,22 @@ module Compute
       @pool = addr_hash["pool"]
     end
 
+  end
 
+  class FloatingIPInfo
+    attr_reader :address
+    attr_reader :instance_uuid
+    attr_reader :interface
+    attr_reader :pool
+    attr_reader :project_id
+
+    def initialize(info_hash)
+      @address = info_hash['address']
+      @instance_uuid = info_hash['instance_uuid']
+      @interface = info_hash['interface']
+      @pool = info_hash['pool']
+      @project_id = info_hash['project_id']
+    end
   end
 
 end

data/lib/openstack/compute/connection.rb

@@ -465,6 +465,37 @@ module Compute
       true
     end
 
+    def get_floating_ip_polls
+      check_extension 'os-floating-ip-pools'
+      response = @connection.req('GET', '/os-floating-ip-pools')
+      res = JSON.parse(response.body)['floating_ip_pools']
+    end
+
+    def get_floating_ips_bulk
+      check_extension 'os-floating-ips-bulk'
+      response = @connection.req('GET', '/os-floating-ips-bulk')
+      res = JSON.parse(response.body)['floating_ip_info']
+      res.inject([]){|result, c| result << OpenStack::Compute::FloatingIPInfo.new(c); result}
+    end
+
+    def create_floating_ips_bulk(opts = {})
+      raise ArgumentError, 'Should not be empty' if opts.empty?
+      data = JSON.generate({:floating_ips_bulk_create => opts})
+      check_extension 'os-floating-ips-bulk'
+      response = @connection.req('POST', '/os-floating-ips-bulk', {:data => data})
+      JSON.parse(response.body)['floating_ips_bulk_create']
+    end
+
+    # Not working
+    # Nova does not supported deletion via API
+    def delete_floating_ips_bulk(opts = {})
+      raise ArgumentError, 'Should not be empty' if opts.empty?
+      data = JSON.generate(opts)
+      check_extension 'os-floating-ips-bulk'
+      response = @connection.req('POST', '/os-floating-ips-bulk/delete', {:data => data})
+      res = JSON.generate(response)
+    end
+
     private
 
     def check_extension(name)
@@ -472,7 +503,6 @@ module Compute
       true
     end
 
-
 end
 
 end

data/lib/openstack/connection.rb

@@ -12,6 +12,8 @@ class Connection
     attr_accessor :service_path
     attr_accessor :service_port
     attr_accessor :service_scheme
+    attr_accessor :quantum_version
+    attr_reader   :retries
     attr_reader   :auth_host
     attr_reader   :auth_port
     attr_reader   :auth_scheme
@@ -78,6 +80,7 @@ class Connection
     private_class_method :new
 
     def initialize(options = {:retry_auth => true})
+      @retries = options[:retries] || 3
       @authuser = options[:username] || (raise Exception::MissingArgument, "Must supply a :username")
       @authkey = options[:api_key] || (raise Exception::MissingArgument, "Must supply an :api_key")
       @auth_url = options[:auth_url] || (raise Exception::MissingArgument, "Must supply an :auth_url")
@@ -104,10 +107,15 @@ class Connection
       @proxy_port = options[:proxy_port]
       @authok = false
       @http = {}
+      @quantum_version = 'v2.0' if @service_type == 'network'
     end
 
     #specialised from of csreq for PUT object... uses body_stream if possible
     def put_object(server,path,port,scheme,headers = {},data = nil,attempts = 0) # :nodoc:
+
+      tries = @retries
+      time = 3
+
       if data.respond_to? :read
         headers['Transfer-Encoding'] = 'chunked'
         hdrhash = headerprep(headers)
@@ -132,11 +140,12 @@ class Connection
       response
     rescue Errno::EPIPE, Timeout::Error, Errno::EINVAL, EOFError
       # Server closed the connection, retry
-      raise OpenStack::Exception::Connection, "Unable to reconnect to #{server} after #{attempts} attempts" if attempts >= 5
-      attempts += 1
+      puts "Can't connect to the server: #{tries} tries to reconnect" if @is_debug
+      sleep time += 1
       @http[server].finish if @http[server].started?
-      start_http(server,path,port,scheme,headers)
-      retry
+      retry unless (tries -= 1) <= 0
+      raise OpenStack::Exception::Connection, "Unable to connect to #{server} after #{@retries} retries"
+
     rescue OpenStack::Exception::ExpiredAuthToken
       raise OpenStack::Exception::Connection, "Authentication token expired and you have requested not to retry" if @retry_auth == false
       OpenStack::Authentication.init(self)
@@ -146,6 +155,10 @@ 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
+
       hdrhash = headerprep(headers)
       start_http(server,path,port,scheme,hdrhash)
       request = Net::HTTP.const_get(method.to_s.capitalize).new(path,hdrhash)
@@ -169,11 +182,11 @@ class Connection
       response
     rescue Errno::EPIPE, Timeout::Error, Errno::EINVAL, EOFError
       # Server closed the connection, retry
-      raise OpenStack::Exception::Connection, "Unable to reconnect to #{server} after #{attempts} attempts" if attempts >= 5
-      attempts += 1
+      puts "Can't connect to the server: #{tries} tries to reconnect" if @is_debug
+      sleep time += 1
       @http[server].finish if @http[server].started?
-      start_http(server,path,port,scheme,headers)
-      retry
+      retry unless (tries -= 1) <= 0
+      raise OpenStack::Exception::Connection, "Unable to connect to #{server} after #{@retries} retries"
     rescue OpenStack::Exception::ExpiredAuthToken
       raise OpenStack::Exception::Connection, "Authentication token expired and you have requested not to retry" if @retry_auth == false
       OpenStack::Authentication.init(self)
@@ -189,13 +202,10 @@ class Connection
       headers  = options[:headers]  || {'content-type' => 'application/json'}
       data     = options[:data]
       attempts = options[:attempts] || 0
-      path = @service_path + path
+      path = @service_path + @quantum_version.to_s + path
       res = csreq(method,server,path,port,scheme,headers,data,attempts)
-      if not res.code.match(/^20.$/)
-        OpenStack::Exception.raise_exception(res)
-      end
-      return res
-    end;
+      res.code.match(/^20.$/) ? (return res) : OpenStack::Exception.raise_exception(res)
+    end
 
     private
 
@@ -205,13 +215,17 @@ class Connection
       default_headers["X-Auth-Token"] = @authtoken if authok
       default_headers["X-Storage-Token"] = @authtoken if authok
       default_headers["Connection"] = "Keep-Alive"
-      default_headers["User-Agent"] = "OpenStack Ruby API #{VERSION}"
+      default_headers["User-Agent"] = "OpenStack Ruby API #{OpenStack::VERSION}"
       default_headers["Accept"] = "application/json"
       default_headers.merge(headers)
     end
 
     # Starts (or restarts) the HTTP connection
     def start_http(server,path,port,scheme,headers) # :nodoc:
+
+      tries = @retries
+      time = 3
+
       if (@http[server].nil?)
         begin
           @http[server] = Net::HTTP::Proxy(@proxy_host, @proxy_port).new(server,port)
@@ -221,6 +235,9 @@ class Connection
           end
           @http[server].start
         rescue
+          puts "Can't connect to the server: #{tries} tries to reconnect" if @is_debug
+          sleep time += 1
+          retry unless (tries -= 1) <= 0
           raise OpenStack::Exception::Connection, "Unable to connect to #{server}"
         end
       end
@@ -254,6 +271,10 @@ class AuthV20
   attr_reader :uri
   attr_reader :version
   def initialize(connection)
+
+    tries = connection.retries
+    time = 3
+
     begin
       server = Net::HTTP::Proxy(connection.proxy_host, connection.proxy_port).new(connection.auth_host, connection.auth_port)
       if connection.auth_scheme == "https"
@@ -262,7 +283,10 @@ class AuthV20
       end
       server.start
     rescue
-      raise OpenStack::Exception::Connection, "Unable to connect to #{server}"
+      puts "Can't connect to the server: #{tries} tries  to reconnect" if connection.is_debug
+      sleep time += 1
+      retry unless (tries -= 1) <= 0
+      raise OpenStack::Exception::Connection, "Unable to connect to  #{server}"
     end
 
     @uri = String.new
@@ -347,6 +371,10 @@ end
 class AuthV10
 
   def initialize(connection)
+
+    tries = connection.retries
+    time = 3
+
     hdrhash = { "X-Auth-User" => connection.authuser, "X-Auth-Key" => connection.authkey }
     begin
       server = Net::HTTP::Proxy(connection.proxy_host, connection.proxy_port).new(connection.auth_host, connection.auth_port)
@@ -356,9 +384,14 @@ class AuthV10
       end
       server.start
     rescue
+      puts "Can't connect to the server: #{tries} tries  to reconnect" if connection.is_debug
+      sleep time += 1
+      retry unless (tries -= 1) <= 0
       raise OpenStack::Exception::Connection, "Unable to connect to #{server}"
     end
+
     response = server.get(connection.auth_path, hdrhash)
+
     if (response.code =~ /^20./)
       connection.authtoken = response["x-auth-token"]
       case connection.service_type

data/lib/openstack/network/connection.rb

@@ -31,8 +31,10 @@ module Network
     end
     alias :network :get_network
 
-    def create_network(name)
-      req_body = JSON.generate({"network"=>{"name"=>name}})
+    def create_network(name, parameter={})
+      body_hash = {"network" => {"name"=>name}}
+      body_hash['network'].merge! parameter
+      req_body = JSON.generate(body_hash)
       response = @connection.req("POST", "/networks", {:data=>req_body})
       OpenStack::Network::Network.new(JSON.parse(response.body)["network"])
     end
@@ -94,6 +96,61 @@ module Network
       true
     end
 
+    def list_routers
+      response = @connection.req('GET', '/routers')
+      nets_hash = JSON.parse(response.body)['routers']
+      nets_hash.inject([]){|res, current| res << OpenStack::Network::Router.new(current); res}
+    end
+    alias :routers :list_routers
+
+    def create_router(name, admin_state_up, opts={})
+      body_hash = {'router'=> {'name' => name, 'admin_state_up' => admin_state_up}}
+      body_hash['router'].merge! opts
+      req_body = JSON.generate body_hash
+      response = @connection.req('POST', '/routers', {:data => req_body })
+      OpenStack::Network::Router.new(JSON.parse(response.body)['router'])
+    end
+
+    def delete_router_by_name(name)
+      @connection.req('DELETE', "/routers/#{get_router_id(name)}")
+    end
+
+    def delete_router(id)
+      @connection.req('DELETE', "/routers/#{id}")
+    end
+
+    def add_router_interface_by_name(name, interface)
+      @connection.req('PUT', "/routers/#{get_router_id(name)}/#{interface}")
+    end
+
+    def add_router_interface(id, subnet_id)
+      req_body = JSON.generate({'subnet_id' => subnet_id})
+      @connection.req('PUT', "/routers/#{id}/add_router_interface", {:data => req_body})
+    end
+
+    def remove_router_interface(id, subnet_id)
+      req_body = JSON.generate({'subnet_id' => subnet_id})
+      @connection.req('PUT', "/routers/#{id}/remove_router_interface", {:data => req_body})
+    end
+
+    def update_router_by_name(name,opts={})
+      req_body = JSON.generate opts
+      response = @connection.req('PUT',"/routers/#{get_router_id(name)}",{:data => req_body})
+      OpenStack::Network::Router.new(JSON.parse(response.body)['router'])
+    end
+
+    def update_router(id,opts={})
+      req_body = JSON.generate({'router' => opts})
+      response = @connection.req('PUT',"/routers/#{id}",{:data => req_body})
+      OpenStack::Network::Router.new(JSON.parse(response.body)['router'])
+    end
+
+    def get_router_id(name)
+      routers.detect do |value|
+        return value.id if value.name == name
+      end
+    end
+
   end
 
 end

data/lib/openstack/network/port.rb

@@ -13,7 +13,7 @@ module Network
     attr_reader :device_owner
     attr_reader :tenant_id
 
-    def initialize(port_hash)
+    def initialize(port_hash={})
       @id = port_hash["id"]
       @network_id = port_hash["network_id"]
       @name = port_hash["name"]

data/lib/openstack/network/router.rb

@@ -0,0 +1,27 @@
+module OpenStack
+module Network
+  class Router
+
+    attr_reader :id
+    attr_reader :name
+    attr_reader :admin_state_up
+    attr_reader :status
+    attr_reader :external_gateway_info
+    attr_reader :tenant_ip
+    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']
+      @admin_state_up = router_info['admin_state_up']
+      @tenant_ip = router_info['tenant_ip']
+      @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
+end

data/lib/openstack/network/subnet.rb

@@ -14,7 +14,7 @@ module Network
     attr_reader :enable_dhcp
     attr_reader :tenant_id
 
-    def initialize(subnet_hash)
+    def initialize(subnet_hash={})
       @id = subnet_hash["id"]
       @network_id = subnet_hash["network_id"]
       @name = subnet_hash["name"]

data/lib/openstack/version.rb

@@ -0,0 +1,3 @@
+module OpenStack
+  VERSION = '1.1.2'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -28,6 +28,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +87,7 @@ extra_rdoc_files:
 files:
 - COPYING
 - README.rdoc
-- VERSION
+- lib/openstack/version.rb
 - lib/openstack.rb
 - lib/openstack/compute/address.rb
 - lib/openstack/compute/connection.rb
@@ -86,6 +102,7 @@ files:
 - lib/openstack/network/network.rb
 - lib/openstack/network/port.rb
 - lib/openstack/network/subnet.rb
+- lib/openstack/network/router.rb
 - lib/openstack/swift/connection.rb
 - lib/openstack/swift/container.rb
 - lib/openstack/swift/storage_object.rb

data/VERSION

@@ -1 +0,0 @@
-1.1.1