openstack_activeresource 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

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

@@ -20,7 +20,7 @@ module OpenStack
     module Compute
 
       class SecurityGroup < Base
-        self.element_name = "os-security-group"
+        self.element_name = "security_group"
         self.collection_name = "os-security-groups"
 
         schema do
@@ -35,7 +35,7 @@ module OpenStack
       end
 
       class SecurityGroup::Rule < Base
-        self.element_name = "os-security-group-rule"
+        self.element_name = "security_group_rule"
         self.collection_name = "os-security-group-rules"
 
         schema do
@@ -67,13 +67,13 @@ module OpenStack
               :ip_protocol => attributes[:ip_protocol],
               :from_port => attributes[:from_port],
               :to_port => attributes[:to_port],
-              :cidr => attributes[:cidr] || attributes[:ip_range][:cidr],
+              :cidr => attributes[:cidr] || (attributes[:ip_range].present? ? attributes[:ip_range][:cidr] : nil,
               :parent_group_id => attributes[:parent_group].present? ? attributes[:parent_group].id : nil
           }
           super(new_attributes, persisted)
         end
 
-        # Overload ActiveRecord::encode method
+        # Override ActiveRecord::encode method
         # Custom encoding to deal with openstack API
         def encode(options={})
           to_encode = {
@@ -114,4 +114,3 @@ module OpenStack
     end
   end
 end
-

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

@@ -83,9 +83,16 @@ module OpenStack
             new_attributes[:flavor_id] = attributes[:flavor_id]
           end
 
-          super(new_attributes, persisted)
+          if persisted
+            # We ignore the list of security group names provided in attributes[:security_group]
+            # Security group ids will be retrieved when needed
+            new_attributes[:security_group_ids] = []
+          else
 
-          @attributes[:security_group_ids] = get_security_group_ids
+            new_attributes[:security_group_ids] = attributes[:security_group_ids] || attributes[:security_groups].map { |sg| sg.id }
+          end
+
+          super(new_attributes, persisted)
 
           self
         end
@@ -104,7 +111,7 @@ module OpenStack
           # Optional attributes (openstack will not accept empty attribute for update/create)
           to_encode[:server][:user_data] = Base64.encode64(user_data) if user_data.present?
           to_encode[:server][:key_name] = key_pair_id if key_pair_id.present?
-          to_encode[:server][:security_groups] = get_security_groups.map { |sg| {:name => sg.name} } || []
+          to_encode[:server][:security_groups] = security_groups.map { |sg| {:name => sg.name} }
 
           to_encode.send("to_#{self.class.format.extension}", options)
         end
@@ -136,13 +143,19 @@ module OpenStack
         end
 
         def security_groups
-          get_security_groups
+          if persisted?
+            get('os-security-groups').map { |sg| OpenStack::Nova::Compute::SecurityGroup.new(sg, true) }
+          else
+            security_group_ids.map { |sg_id| OpenStack::Nova::Compute::SecurityGroup.find sg_id }
+          end
         end
 
         def security_groups=(security_groups)
           return if persisted? # Do Nothing (it's a read-only attribute for OpenStack)
 
-          @attributes[:security_group_ids] = get_security_group_ids(security_groups)
+          security_group_ids = security_groups.map { |sg| sg.id }
+
+          security_groups
         end
 
         def addresses
@@ -283,29 +296,6 @@ module OpenStack
           post(:action, {}, {:'resume' => nil}.to_json)
         end
 
-        private
-
-        def get_security_groups
-          security_group_ids.map { |sg_id|
-            SecurityGroup.find sg_id
-          }
-        end
-
-        def get_security_group_ids(security_groups=nil)
-          if security_groups.nil?
-            if persisted?
-
-              get('os-security-groups').map { |security_group| security_group.with_indifferent_access[:id] }
-            else
-
-              []
-            end
-          else
-
-            security_groups.map { |security_group| security_group.id }
-          end
-        end
-
       end
 
     end

data/openstack_activeresource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "openstack_activeresource"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Davide Guerri"]
-  s.date = "2013-01-02"
+  s.date = "2013-01-07"
   s.description = "OpenStack Ruby and RoR bindings implemented with ActiveResource - See also http://www.unicloud.it"
   s.email = "d.guerri@unidata.it"
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: openstack_activeresource
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Davide Guerri
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-02 00:00:00 Z
+date: 2013-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
@@ -170,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2402930155803732714
+      hash: 3406496553585609494
       segments: 
       - 0
       version: "0"