openstack_activeresource 0.5.2 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/README.rdoc CHANGED
@@ -17,7 +17,7 @@ Command line:
17
17
 
18
18
  Or in bundler Gemfile:
19
19
 
20
- gem "openstack_activeresource", "~> 0.5.0"
20
+ gem "openstack_activeresource", "~> 0.6.0"
21
21
 
22
22
  == Sample usages
23
23
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.5.2
1
+ 0.6.0
@@ -111,6 +111,11 @@ module OpenStack
111
111
  # We ignore the list of security group names provided in attributes[:security_group]
112
112
  # Security group ids will be retrieved when needed
113
113
  new_attributes[:security_group_ids] = []
114
+
115
+ new_attributes[:nets] = []
116
+ attributes[:addresses].each do |net_name, addresses|
117
+ new_attributes[:nets] << { :name => net_name, :addresses => addresses }
118
+ end
114
119
  else
115
120
 
116
121
  if attributes[:security_group_ids].nil?
@@ -219,18 +224,6 @@ module OpenStack
219
224
  security_groups
220
225
  end
221
226
 
222
- # Addresses hash associated to this server
223
- def addresses
224
- addresses = {}
225
- if persisted?
226
- response = get('ips')
227
- response.each do |net, address|
228
- addresses[net] = address
229
- end
230
- end
231
- addresses
232
- end
233
-
234
227
  def addresses=(something) # :nodoc: do Nothing (it's a read-only attribute for OpenStack)
235
228
 
236
229
  end
@@ -272,9 +265,9 @@ module OpenStack
272
265
  self.task = updated.task
273
266
  self.power_state = updated.power_state
274
267
  self.vm_state = updated.vm_state
275
-
276
- self
277
268
  end
269
+
270
+ self
278
271
  end
279
272
 
280
273
  SERVER_STATUSES = {
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "openstack_activeresource"
8
- s.version = "0.5.2"
8
+ s.version = "0.6.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Davide Guerri"]
12
- s.date = "2013-03-18"
12
+ s.date = "2013-03-28"
13
13
  s.description = "OpenStack Ruby and RoR bindings implemented with ActiveResource - See also http://www.unicloud.it"
14
14
  s.email = "d.guerri@rd.unidata.it"
15
15
  s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
35
35
  end
36
36
 
37
37
  # Verify server
38
- my_server = loop_block(5) do
38
+ my_server = loop_block(15) do
39
39
  begin
40
40
  OpenStack::Nova::Compute::Server.find new_server_id
41
41
  rescue ActiveResource::ResourceNotFound
@@ -43,12 +43,17 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
43
43
  nil
44
44
  end
45
45
  end
46
- assert_not_nil my_server, "Server not spawned after 5 seconds!?!"
46
+ assert_not_nil my_server, "Server not spawned after 15 seconds!?!"
47
47
 
48
48
  # Wait for a network address
49
49
  my_address = loop_block(60) do
50
50
  my_server = OpenStack::Nova::Compute::Server.find new_server_id
51
- my_server.addresses.keys.count > 0 ? my_server.addresses : nil
51
+ if my_server.nets.count > 0 and my_server.nets[0].addresses.count > 0 and my_server.nets[0].addresses[0].addr.present?
52
+ # puts "**** #{my_server.nets[0].addresses[0].addr} ****"
53
+ my_server.nets[0].addresses[0].addr
54
+ else
55
+ nil
56
+ end
52
57
  end
53
58
  assert_not_nil my_address, "No address after a minute!"
54
59
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openstack_activeresource
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.2
4
+ version: 0.6.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-03-18 00:00:00.000000000 Z
12
+ date: 2013-03-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activemodel
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
239
239
  version: '0'
240
240
  segments:
241
241
  - 0
242
- hash: -1255769968563812173
242
+ hash: 3388499948375313041
243
243
  required_rubygems_version: !ruby/object:Gem::Requirement
244
244
  none: false
245
245
  requirements: