openstack_activeresource 0.4.0 → 0.5.0

data/Gemfile

@@ -1,16 +1,17 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem "activemodel", "~> 3.2.6", :require => 'active_model'
-gem "activeresource", "~> 3.2.6", :require => 'active_resource'
+gem "activemodel", "~> 3.2.12", :require => 'active_model'
+gem "activeresource", "~> 3.2.12", :require => 'active_resource'
 
 gem "oj", "~> 1.2.9"
 
-gem "bundler", "~> 1.2.0"
-
-gem "shoulda", ">= 0"
-gem "rdoc", "~> 3.12"
-gem "jeweler", "~> 1.8.4"
-gem "simplecov", ">= 0"
+group :development, :test do
+  gem "shoulda", ">= 0"
+  gem "rdoc", "~> 3.12"
+  gem "jeweler", "~> 1.8.4"
+  gem "simplecov", ">= 0"
+  gem 'test-unit'
+end
 
 # Security fixes
-gem "json", "~> 1.7.7"
+gem "json", "~> 1.7.7"

data/Gemfile.lock

@@ -1,20 +1,20 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.4)
     git (1.2.5)
-    i18n (0.6.1)
+    i18n (0.6.4)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -24,10 +24,10 @@ GEM
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
+    multi_json (1.6.1)
     oj (1.2.13)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
     shoulda (3.3.2)
       shoulda-context (~> 1.0.1)
@@ -40,17 +40,18 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    test-unit (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 3.2.6)
-  activeresource (~> 3.2.6)
-  bundler (~> 1.2.0)
+  activemodel (~> 3.2.12)
+  activeresource (~> 3.2.12)
   jeweler (~> 1.8.4)
   json (~> 1.7.7)
   oj (~> 1.2.9)
   rdoc (~> 3.12)
   shoulda
   simplecov
+  test-unit

data/LICENSE.txt

@@ -1,4 +1,5 @@
 OpenStack-ActiveResource
+Copyright (c) 2013 Davide Guerri (@dguerri davide.guerri@gmail.com)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/README.rdoc

@@ -17,7 +17,7 @@ Command line:
 
 Or in bundler Gemfile:
 
-   gem "openstack_activeresource", "~> 0.3.2"
+   gem "openstack_activeresource", "~> 0.5.0"
 
 == Sample usages
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/hot_fixes.rb

@@ -17,7 +17,9 @@
 
 # Reopens ActiveResource::Base to fix "ActiveResource nested resources not being persisted"
 # See https://github.com/rails/rails/pull/3107
-module ActiveResource #:nodoc:
+# and https://github.com/rails/activeresource/pull/30
+# Fixes non yet included in any ActiveResource releases (as of 2013-02-28)
+module ActiveResource # :nodoc:
   class Base
 
     def load(attributes, remove_root = false)

data/lib/open_stack/base.rb

@@ -68,10 +68,10 @@ class ActiveResource::ClientError < ActiveResource::ConnectionError
 
   def message
     decoded_error = decode_openstack_error
-    decoded_error.nil? ? old_message : decoded_error
+    decoded_error.nil? ? @message : decoded_error
   rescue Exception => e
     # Fallback to the original method
-    old_message
+    @message
   end
 
   def to_s

data/lib/open_stack/keystone/admin.rb

@@ -25,7 +25,6 @@ module OpenStack
       autoload :Role
       autoload :Tenant
       autoload :User
-      autoload :UserRole
     end
 
   end

data/lib/open_stack/keystone/admin/role.rb

@@ -30,6 +30,11 @@ module OpenStack
           attribute :name, :string
         end
 
+        validates :name,
+                  :presence => true,
+                  :length => {:minimum => 4, :allow_blank => true},
+                  :format => {:with => /\A[0-9a-z_]+\Z/i, :allow_blank => true}
+
         # List Roles with a given name
         def self.find_by_name(name)
           all.detect { |role| role.name == name }

data/lib/open_stack/keystone/admin/tenant.rb

@@ -34,21 +34,20 @@ module OpenStack
         end
 
         validates :enabled,
-                  :presence => true,
-                  :inclusion => {:in => [true, false], :allow_blank => true}
+                  :inclusion => {:in => [true, false]}
         validates :name,
                   :presence => true,
                   :format => {:with => /\A\w[\w\s]+\w\Z/, :allow_blank => true}
         validates :description,
                   :format => {:with => /\A[\w\s\.\-:@+,'"]+\Z/, :allow_blank => true}
 
-        def initialize(params = {}, persisted = false) #:notnew:
+        def initialize(params = {}, persisted = false) # :notnew:
           super(params, persisted)
 
           self.description = description
         end
 
-        def self.find_every(options) #:nodoc:
+        def self.find_every(options) # :nodoc:
           class_name = self.name.split('::').last.downcase
           begin
             case from = options[:from]

data/lib/open_stack/keystone/admin/user.rb

@@ -42,17 +42,16 @@ module OpenStack
                   :length => {:minimum => 4, :allow_blank => true},
                   :format => {:with => /\A[0-9a-z_]+\Z/i, :allow_blank => true}
         validates :password,
-                  :presence => true,
+                  :presence => { :with =>true, :on => :create },
                   :format => {:with => /(?=.*[\d\W])/, :message => :must_contain_at_least_one_digit_or_one_special_character, :allow_blank => true},
                   :length => {:minimum => 8, :allow_blank => true}
         validates :email,
                   :presence => true,
                   :format => {:with => /\A[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}\Z/i, :allow_blank => true}
         validates :enabled,
-                  :presence => true,
-                  :inclusion => {:in => [true, false], :allow_blank => true}
+                  :inclusion => {:in => [true, false]}
 
-        def initialize(attributes = {}, persisted = false) #:notnew:
+        def initialize(attributes = {}, persisted = false) # :notnew:
           attributes = attributes.with_indifferent_access
 
           if attributes[:tenant].present?
@@ -67,7 +66,7 @@ module OpenStack
         end
 
         # Overloads ActiveRecord::encode method
-        def encode(options={}) #:nodoc: Custom encoding to deal with openstack API
+        def encode(options={}) # :nodoc: Custom encoding to deal with openstack API
           to_encode = {
               :user => {
                   :name => name,
@@ -133,7 +132,28 @@ module OpenStack
         def roles(scope = :all, tenant = nil)
           tenant_id = tenant.is_a?(OpenStack::Keystone::Admin::Tenant) ? tenant.id : (tenant || self.tenant_id)
 
-          OpenStack::Keystone::Admin::UserRole.find(scope, :params => {:tenant_id => tenant_id, :user_id => self.id})
+          UserRole.find(scope, :params => {:tenant_id => tenant_id, :user_id => self.id})
+        end
+
+        # User Role ("admin view") (\*Warning:* incomplete)
+        #
+        # ==== Attributes
+        # * +name+ - The name of the Role
+        # * +description+ - A description of the role
+        class UserRole < Base
+          self.element_name = "role"
+          self.site = "#{superclass.site}/tenants/:tenant_id/users/:user_id"
+
+          schema do
+            attribute :name, :string
+            attribute :description, :string
+          end
+
+          # Return the associated instance of OpenStack::Keystone::Admin::Role
+          def role
+            OpenStack::Keystone::Admin::Role.find(self.id) if persisted?
+          end
+
         end
 
       end

data/lib/open_stack/keystone/public/auth.rb

@@ -36,7 +36,7 @@ module OpenStack
                   :presence => true,
                   :unless => Proc.new { token.present? }
 
-        def initialize(attributes = {}, persisted = false) #:notnew:
+        def initialize(attributes = {}, persisted = false) # :notnew:
           attributes[:username] ||= ""
           attributes[:password] ||= ""
 
@@ -50,7 +50,7 @@ module OpenStack
         end
 
         # Overloads ActiveRecord::encode method
-        def encode(options={}) #:nodoc: Custom encoding to deal with openstack API
+        def encode(options={}) # :nodoc: Custom encoding to deal with openstack API
           to_encode = {}
           if token.present?
             to_encode[:auth] = {
@@ -72,7 +72,7 @@ module OpenStack
           to_encode.send("to_#{self.class.format.extension}", options)
         end
 
-        def save #:nodoc: Catch some exceptions to perform "remote validation" of this resource
+        def save # :nodoc: Catch some exceptions to perform "remote validation" of this resource
           super
         rescue ActiveResource::UnauthorizedAccess
           errors.add :password, I18n.t(:is_invalid)
@@ -133,7 +133,7 @@ module OpenStack
           attribute :expires, :string
         end
 
-        def initialize(attributes = {}, persisted = false) #:notnew:
+        def initialize(attributes = {}, persisted = false) # :notnew:
           attributes = attributes.with_indifferent_access
           new_attributes = {
               :id => attributes[:id],

data/lib/open_stack/keystone/public/tenant.rb

@@ -31,10 +31,9 @@ module OpenStack
           attribute :name, :string
           attribute :description, :string
           attribute :enabled, :boolean
-
         end
 
-        def self.find_every(options) #:nodoc:
+        def self.find_every(options) # :nodoc:
           class_name = self.name.split('::').last.downcase
           begin
             case from = options[:from]

data/lib/open_stack/nova/compute/base.rb

@@ -21,6 +21,8 @@ module OpenStack
 
       class Base < OpenStack::Common
 
+        # The following 2 methods overloading are required for Rails applications
+
         # Get the Nova Compute endpoint assigned to OpenStack::Nova::Compute classes
         def self.site
           if self == OpenStack::Nova::Compute::Base

data/lib/open_stack/nova/compute/base_detail.rb

@@ -19,7 +19,7 @@ module OpenStack
   module Nova
     module Compute
 
-      class BaseDetail < Base #:nodoc:
+      class BaseDetail < Base # :nodoc:
 
         # Overrides ActiveResource::Base::collection_path to add /details to resource path for servers and
         # to remove .<extension>

data/lib/open_stack/nova/compute/flavor.rb

@@ -25,18 +25,22 @@ module OpenStack
       # * +name+ - The name of the flavor
       # * +ram+ - Amount of RAM (MBytes)
       # * +disk+ - Amount of storage (GBytes)
+      # * +swap+ - Amount of swap storage (MBytes)
       # * +vcpus+ - Virtual CPUs
       # * +rxtx_factor+ - Traffic shaping (?)
       # * +ephemeral_disk+ - Ephemeral storage amount (GByte)
+      # * +is_public+ - True if the flavor is public
       class Flavor < BaseDetail
 
         schema do
           attribute :name, :string
           attribute :ram, :integer
           attribute :disk, :integer
+          attribute :swap, :integer
           attribute :vcpus, :integer
           attribute :rxtx_factor, :float
           attribute :ephemeral_disk, :integer
+          attribute :is_public, :boolean
         end
 
         validates :name,
@@ -52,9 +56,55 @@ module OpenStack
         validates :disk,
                   :presence => true,
                   :numericality => {:greater_than_or_equal_to => 10, :only_integer => true, :allow_blank => true}
+        validates :swap,
+                  :presence => true,
+                  :numericality => {:greater_than_or_equal_to => 1, :only_integer => true, :allow_blank => true}
         validates :ephemeral_disk,
-                  :presence => false,
-                  :numericality => {:greater_than_or_equal_to => 10, :only_integer => true}
+                  :presence => true,
+                  :numericality => {:greater_than_or_equal_to => 0, :only_integer => true, :allow_blank => true}
+        validates :rxtx_factor,
+                  :presence => true,
+                  :numericality => {:only_integer => false, :allow_blank => true}
+        validates :is_public,
+                  :inclusion => {:in => [true, false], :allow_blank => true}
+
+        def initialize(attributes = {}, persisted = false) # :notnew:
+          attributes = attributes.with_indifferent_access
+          new_attributes = {
+              :id => attributes[:id],
+              :name => attributes[:name],
+              :ram => attributes[:ram],
+              :disk => attributes[:disk],
+              :swap => attributes[:swap],
+              :vcpus => attributes[:vcpus],
+              :rxtx_factor => attributes[:rxtx_factor],
+              :ephemeral_disk => attributes[:'OS-FLV-EXT-DATA:ephemeral'] || attributes[:ephemeral_disk],
+              :is_public => attributes[:'os-flavor-access:is_public'] || attributes[:is_public]
+          }
+          super(new_attributes, persisted)
+
+          self
+        end
+
+        # Overloads ActiveRecord::encode method
+        def encode(options={}) # :nodoc: Custom encoding to deal with openstack API
+          to_encode = {
+              :flavor => {
+                  :name => name,
+                  :ram => ram,
+                  :disk => disk,
+                  :swap => swap,
+                  :vcpus => vcpus
+              }
+          }
+
+          # Optional attributes (openstack will not accept empty attribute for update/create)
+          to_encode[:flavor][:'OS-FLV-EXT-DATA:ephemeral'] = ephemeral_disk if ephemeral_disk.present?
+          to_encode[:flavor][:'os-flavor-access:is_public'] = is_public if is_public.present?
+          to_encode[:flavor][:rxtx_factor] = rxtx_factor if rxtx_factor.present?
+
+          to_encode.send("to_#{self.class.format.extension}", options)
+        end
 
         # Returns a list of Flavor for a given name
         #
@@ -82,7 +132,7 @@ module OpenStack
           constraints[:vcpus] ||= -1.0/0.0
           constraints[:disk] ||= -1.0/0.0
 
-          all.select { |flavor| flavor.ram >= constraints[:ram] and flavor.vcpus >= constraints[:vcpus] and flavor.disk >= constraints[:disk] }
+          self.all.select { |flavor| flavor.ram >= constraints[:ram] and flavor.vcpus >= constraints[:vcpus] and flavor.disk >= constraints[:disk] }
         end
 
         # Returns a list of Flavor that can be used with the given Image
@@ -99,11 +149,6 @@ module OpenStack
           find_by_constraints constraints
         end
 
-        # Returns the amount of ephemeral disk
-        def ephemeral_disk
-          @attributes[:'OS-FLV-EXT-DATA:ephemeral'] || nil
-        end
-
         # Returns a human-friendly description for this Flavor
         def description
           "#{vcpus} vCPU - #{ram} MB RAM - #{disk} GB Disk"

data/lib/open_stack/nova/compute/floating_ip.rb

@@ -38,7 +38,7 @@ module OpenStack
         end
 
         # Overloads ActiveRecord::encode method
-        def encode(options={}) #:nodoc: Custom encoding to deal with openstack API
+        def encode(options={}) # :nodoc: Custom encoding to deal with openstack API
           to_encode = {}
           # Optional attributes (openstack will not accept empty attribute for update/create)
           to_encode[:pool] = pool if pool.present?

data/lib/open_stack/nova/compute/key_pair.rb

@@ -37,7 +37,7 @@ module OpenStack
           attribute :fingerprint, :string
         end
 
-        def id #:nodoc:
+        def id # :nodoc:
           name
         end
 

data/lib/open_stack/nova/compute/security_group.rb

@@ -50,7 +50,7 @@ module OpenStack
       # * +to_port+ - Final port
       # * +parent_group_id+ - The security group this rule belongs to
       # * +cidr+ - A cidr
-      class SecurityGroup::Rule < Base
+      class Rule < Base
         self.element_name = "security_group_rule"
         self.collection_name = "os-security-group-rules"
 
@@ -76,7 +76,7 @@ module OpenStack
         validates_numericality_of :to_port, :greater_than_or_equal_to => :from_port, :if => Proc.new { |rule| rule.udp? or rule.tcp? }
 
 
-        def initialize(attributes = {}, persisted = false) #:notnew:
+        def initialize(attributes = {}, persisted = false) # :notnew:
           attributes = attributes.with_indifferent_access
           new_attributes = {
               :id => attributes[:id],
@@ -90,7 +90,7 @@ module OpenStack
         end
 
         # Override ActiveRecord::encode method
-        def encode(options={}) #:nodoc: Custom encoding to deal with openstack API
+        def encode(options={}) # :nodoc: Custom encoding to deal with openstack API
           to_encode = {
               :security_group_rule => {
                   :ip_protocol => ip_protocol,