openstack_activeresource 0.5.2 → 0.6.0

data/README.rdoc

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

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

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

@@ -111,6 +111,11 @@ module OpenStack
             # 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] = []
+
+            new_attributes[:nets] = []
+            attributes[:addresses].each do |net_name, addresses|
+              new_attributes[:nets] << { :name => net_name, :addresses => addresses }
+            end
           else
 
             if attributes[:security_group_ids].nil?
@@ -219,18 +224,6 @@ module OpenStack
           security_groups
         end
 
-        # Addresses hash associated to this server
-        def addresses
-          addresses = {}
-          if persisted?
-            response = get('ips')
-            response.each do |net, address|
-              addresses[net] = address
-            end
-          end
-          addresses
-        end
-
         def addresses=(something) # :nodoc: do Nothing (it's a read-only attribute for OpenStack)
 
         end
@@ -272,9 +265,9 @@ module OpenStack
             self.task = updated.task
             self.power_state = updated.power_state
             self.vm_state = updated.vm_state
-
-            self
           end
+	  
+          self
         end
 
         SERVER_STATUSES = {

data/openstack_activeresource.gemspec

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

data/test/test_nova_servers.rb

@@ -35,7 +35,7 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
     end
 
     # Verify server
-    my_server = loop_block(5) do
+    my_server = loop_block(15) do
       begin
         OpenStack::Nova::Compute::Server.find new_server_id
       rescue ActiveResource::ResourceNotFound
@@ -43,12 +43,17 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
         nil
       end
     end
-    assert_not_nil my_server, "Server not spawned after 5 seconds!?!"
+    assert_not_nil my_server, "Server not spawned after 15 seconds!?!"
 
     # Wait for a network address
     my_address = loop_block(60) do
       my_server = OpenStack::Nova::Compute::Server.find new_server_id
-      my_server.addresses.keys.count > 0 ? my_server.addresses : nil
+      if my_server.nets.count > 0 and my_server.nets[0].addresses.count > 0 and my_server.nets[0].addresses[0].addr.present?
+        # puts "**** #{my_server.nets[0].addresses[0].addr} ****"
+        my_server.nets[0].addresses[0].addr
+      else
+        nil
+      end
     end
     assert_not_nil my_address, "No address after a minute!"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack_activeresource
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1255769968563812173
+      hash: 3388499948375313041
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: