fog-openstack 0.1.12 → 0.1.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +0 -1
- data/README.md +2 -2
- data/Rakefile +1 -8
- data/docs/orchestration.md +19 -0
- data/fog-openstack.gemspec +2 -1
- data/gemfiles/Gemfile-1.9 +2 -1
- data/lib/fog/dns/openstack/v2.rb +20 -0
- data/lib/fog/dns/openstack/v2/models/recordset.rb +55 -0
- data/lib/fog/dns/openstack/v2/models/recordsets.rb +30 -0
- data/lib/fog/dns/openstack/v2/models/zone.rb +50 -0
- data/lib/fog/dns/openstack/v2/models/zones.rb +30 -0
- data/lib/fog/dns/openstack/v2/requests/delete_recordset.rb +5 -3
- data/lib/fog/dns/openstack/v2/requests/delete_zone.rb +5 -3
- data/lib/fog/dns/openstack/v2/requests/get_quota.rb +4 -2
- data/lib/fog/dns/openstack/v2/requests/get_recordset.rb +4 -2
- data/lib/fog/dns/openstack/v2/requests/get_zone.rb +5 -3
- data/lib/fog/dns/openstack/v2/requests/list_recordsets.rb +29 -5
- data/lib/fog/dns/openstack/v2/requests/list_zones.rb +4 -1
- data/lib/fog/dns/openstack/v2/requests/update_quota.rb +4 -3
- data/lib/fog/dns/openstack/v2/requests/update_recordset.rb +4 -1
- data/lib/fog/dns/openstack/v2/requests/update_zone.rb +4 -1
- data/lib/fog/introspection/openstack.rb +3 -8
- data/lib/fog/monitoring/openstack.rb +7 -1
- data/lib/fog/monitoring/openstack/models/alarm.rb +0 -1
- data/lib/fog/monitoring/openstack/models/alarm_definition.rb +1 -0
- data/lib/fog/monitoring/openstack/models/dimension_value.rb +19 -0
- data/lib/fog/monitoring/openstack/models/dimension_values.rb +16 -0
- data/lib/fog/monitoring/openstack/models/metrics.rb +8 -0
- data/lib/fog/monitoring/openstack/models/notification_method.rb +8 -1
- data/lib/fog/monitoring/openstack/models/notification_methods.rb +4 -0
- data/lib/fog/monitoring/openstack/requests/list_dimension_values.rb +21 -0
- data/lib/fog/monitoring/openstack/requests/list_notification_method_types.rb +21 -0
- data/lib/fog/monitoring/openstack/requests/{update_notification_method.rb → patch_notification_method.rb} +1 -1
- data/lib/fog/monitoring/openstack/requests/put_notification_method.rb +19 -0
- data/lib/fog/network/openstack.rb +12 -8
- data/lib/fog/network/openstack/requests/create_network.rb +54 -63
- data/lib/fog/network/openstack/requests/update_network.rb +27 -8
- data/lib/fog/openstack.rb +44 -28
- data/lib/fog/openstack/version.rb +1 -1
- data/lib/fog/orchestration/openstack.rb +1 -0
- data/lib/fog/orchestration/openstack/models/stack.rb +4 -0
- data/lib/fog/orchestration/openstack/requests/cancel_update.rb +26 -0
- metadata +13 -30
- data/tests/fixtures/introspection.yaml +0 -287
- data/tests/helper.rb +0 -24
- data/tests/helpers/collection_helper.rb +0 -97
- data/tests/helpers/compute/flavors_helper.rb +0 -32
- data/tests/helpers/compute/server_helper.rb +0 -25
- data/tests/helpers/compute/servers_helper.rb +0 -10
- data/tests/helpers/formats_helper.rb +0 -98
- data/tests/helpers/formats_helper_tests.rb +0 -110
- data/tests/helpers/mock_helper.rb +0 -17
- data/tests/helpers/model_helper.rb +0 -31
- data/tests/helpers/responds_to_helper.rb +0 -11
- data/tests/helpers/schema_validator_tests.rb +0 -107
- data/tests/helpers/succeeds_helper.rb +0 -9
data/tests/helper.rb
DELETED
@@ -1,24 +0,0 @@
|
|
1
|
-
require 'coveralls'
|
2
|
-
Coveralls.wear!
|
3
|
-
|
4
|
-
require File.expand_path('../../lib/fog/openstack', __FILE__)
|
5
|
-
|
6
|
-
Bundler.require(:test)
|
7
|
-
|
8
|
-
Excon.defaults.merge!(:debug_request => true, :debug_response => true)
|
9
|
-
|
10
|
-
require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper'))
|
11
|
-
|
12
|
-
# This overrides the default 600 seconds timeout during live test runs
|
13
|
-
unless Fog.mocking?
|
14
|
-
Fog.timeout = ENV['FOG_TEST_TIMEOUT'] || 2_000
|
15
|
-
Fog::Logger.warning "Setting default fog timeout to #{Fog.timeout} seconds"
|
16
|
-
end
|
17
|
-
|
18
|
-
def lorem_file
|
19
|
-
File.open(File.dirname(__FILE__) + '/lorem.txt', 'r')
|
20
|
-
end
|
21
|
-
|
22
|
-
def array_differences(array_a, array_b)
|
23
|
-
(array_a - array_b) | (array_b - array_a)
|
24
|
-
end
|
@@ -1,97 +0,0 @@
|
|
1
|
-
def collection_tests(collection, params = {}, mocks_implemented = true)
|
2
|
-
tests('success') do
|
3
|
-
|
4
|
-
tests("#new(#{params.inspect})").succeeds do
|
5
|
-
pending if Fog.mocking? && !mocks_implemented
|
6
|
-
collection.new(params)
|
7
|
-
end
|
8
|
-
|
9
|
-
tests("#create(#{params.inspect})").succeeds do
|
10
|
-
pending if Fog.mocking? && !mocks_implemented
|
11
|
-
@instance = collection.create(params)
|
12
|
-
end
|
13
|
-
# FIXME: work around for timing issue on AWS describe_instances mocks
|
14
|
-
|
15
|
-
if Fog.mocking? && @instance.respond_to?(:ready?)
|
16
|
-
@instance.wait_for { ready? }
|
17
|
-
end
|
18
|
-
|
19
|
-
tests("#all").succeeds do
|
20
|
-
pending if Fog.mocking? && !mocks_implemented
|
21
|
-
collection.all
|
22
|
-
end
|
23
|
-
|
24
|
-
if !Fog.mocking? || mocks_implemented
|
25
|
-
@identity = @instance.identity
|
26
|
-
end
|
27
|
-
|
28
|
-
tests("#get(#{@identity})").succeeds do
|
29
|
-
pending if Fog.mocking? && !mocks_implemented
|
30
|
-
collection.get(@identity)
|
31
|
-
end
|
32
|
-
|
33
|
-
tests('Enumerable') do
|
34
|
-
pending if Fog.mocking? && !mocks_implemented
|
35
|
-
|
36
|
-
methods = [
|
37
|
-
'all?', 'any?', 'find', 'detect', 'collect', 'map',
|
38
|
-
'find_index', 'flat_map', 'collect_concat', 'group_by',
|
39
|
-
'none?', 'one?'
|
40
|
-
]
|
41
|
-
|
42
|
-
# JRuby 1.7.5+ issue causes a SystemStackError: stack level too deep
|
43
|
-
# https://github.com/jruby/jruby/issues/1265
|
44
|
-
if RUBY_PLATFORM == "java" and JRUBY_VERSION =~ /1\.7\.[5-8]/
|
45
|
-
methods.delete('all?')
|
46
|
-
end
|
47
|
-
|
48
|
-
methods.each do |enum_method|
|
49
|
-
if collection.respond_to?(enum_method)
|
50
|
-
tests("##{enum_method}").succeeds do
|
51
|
-
block_called = false
|
52
|
-
collection.send(enum_method) {|x| block_called = true }
|
53
|
-
block_called
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
|
58
|
-
[
|
59
|
-
'max_by','min_by'
|
60
|
-
].each do |enum_method|
|
61
|
-
if collection.respond_to?(enum_method)
|
62
|
-
tests("##{enum_method}").succeeds do
|
63
|
-
block_called = false
|
64
|
-
collection.send(enum_method) {|x| block_called = true; 0 }
|
65
|
-
block_called
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
end
|
70
|
-
|
71
|
-
end
|
72
|
-
|
73
|
-
if block_given?
|
74
|
-
yield(@instance)
|
75
|
-
end
|
76
|
-
|
77
|
-
if !Fog.mocking? || mocks_implemented
|
78
|
-
@instance.destroy
|
79
|
-
end
|
80
|
-
end
|
81
|
-
|
82
|
-
tests('failure') do
|
83
|
-
|
84
|
-
if !Fog.mocking? || mocks_implemented
|
85
|
-
@identity = @identity.to_s
|
86
|
-
@identity = @identity.gsub(/[a-zA-Z]/) { Fog::Mock.random_letters(1) }
|
87
|
-
@identity = @identity.gsub(/\d/) { Fog::Mock.random_numbers(1) }
|
88
|
-
@identity
|
89
|
-
end
|
90
|
-
|
91
|
-
tests("#get('#{@identity}')").returns(nil) do
|
92
|
-
pending if Fog.mocking? && !mocks_implemented
|
93
|
-
collection.get(@identity)
|
94
|
-
end
|
95
|
-
|
96
|
-
end
|
97
|
-
end
|
@@ -1,32 +0,0 @@
|
|
1
|
-
def flavors_tests(connection, params = {}, mocks_implemented = true)
|
2
|
-
tests('success') do
|
3
|
-
|
4
|
-
tests("#all").succeeds do
|
5
|
-
pending if Fog.mocking? && !mocks_implemented
|
6
|
-
connection.flavors.all
|
7
|
-
end
|
8
|
-
|
9
|
-
if !Fog.mocking? || mocks_implemented
|
10
|
-
@identity = connection.flavors.first.identity
|
11
|
-
end
|
12
|
-
|
13
|
-
tests("#get('#{@identity}')").succeeds do
|
14
|
-
pending if Fog.mocking? && !mocks_implemented
|
15
|
-
connection.flavors.get(@identity)
|
16
|
-
end
|
17
|
-
|
18
|
-
end
|
19
|
-
|
20
|
-
tests('failure') do
|
21
|
-
|
22
|
-
if !Fog.mocking? || mocks_implemented
|
23
|
-
invalid_flavor_identity = connection.flavors.first.identity.to_s.gsub(/\w/, '0')
|
24
|
-
end
|
25
|
-
|
26
|
-
tests("#get('#{invalid_flavor_identity}')").returns(nil) do
|
27
|
-
pending if Fog.mocking? && !mocks_implemented
|
28
|
-
connection.flavors.get(invalid_flavor_identity)
|
29
|
-
end
|
30
|
-
|
31
|
-
end
|
32
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
def server_tests(connection, params = {}, mocks_implemented = true)
|
2
|
-
model_tests(connection.servers, params, mocks_implemented) do
|
3
|
-
|
4
|
-
tests('#reload').returns(true) do
|
5
|
-
pending if Fog.mocking? && !mocks_implemented
|
6
|
-
@instance.wait_for { ready? }
|
7
|
-
identity = @instance.identity
|
8
|
-
!identity.nil? && identity == @instance.reload.identity
|
9
|
-
end
|
10
|
-
|
11
|
-
responds_to([:ready?, :state])
|
12
|
-
yield if block_given?
|
13
|
-
|
14
|
-
tests('#reboot').succeeds do
|
15
|
-
pending if Fog.mocking? && !mocks_implemented
|
16
|
-
@instance.wait_for { ready? }
|
17
|
-
@instance.reboot
|
18
|
-
end
|
19
|
-
|
20
|
-
if !Fog.mocking? || mocks_implemented
|
21
|
-
@instance.wait_for { ready? }
|
22
|
-
end
|
23
|
-
|
24
|
-
end
|
25
|
-
end
|
@@ -1,98 +0,0 @@
|
|
1
|
-
require "fog/schema/data_validator"
|
2
|
-
|
3
|
-
# format related hackery
|
4
|
-
# allows both true.is_a?(Fog::Boolean) and false.is_a?(Fog::Boolean)
|
5
|
-
# allows both nil.is_a?(Fog::Nullable::String) and ''.is_a?(Fog::Nullable::String)
|
6
|
-
module Fog
|
7
|
-
module Boolean; end
|
8
|
-
module Nullable
|
9
|
-
module Boolean; end
|
10
|
-
module Integer; end
|
11
|
-
module String; end
|
12
|
-
module Time; end
|
13
|
-
module Float; end
|
14
|
-
module Hash; end
|
15
|
-
module Array; end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
[FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)}
|
19
|
-
[FalseClass, TrueClass, NilClass, Fog::Boolean].each {|klass| klass.send(:include, Fog::Nullable::Boolean)}
|
20
|
-
[NilClass, String].each {|klass| klass.send(:include, Fog::Nullable::String)}
|
21
|
-
[NilClass, Time].each {|klass| klass.send(:include, Fog::Nullable::Time)}
|
22
|
-
[Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)}
|
23
|
-
[Float, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Float)}
|
24
|
-
[Hash, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Hash)}
|
25
|
-
[Array, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Array)}
|
26
|
-
|
27
|
-
module Shindo
|
28
|
-
class Tests
|
29
|
-
# Generates a Shindo test that compares a hash schema to the result
|
30
|
-
# of the passed in block returning true if they match.
|
31
|
-
#
|
32
|
-
# The schema that is passed in is a Hash or Array of hashes that
|
33
|
-
# have Classes in place of values. When checking the schema the
|
34
|
-
# value should match the Class.
|
35
|
-
#
|
36
|
-
# Strict mode will fail if the data has additional keys. Setting
|
37
|
-
# +strict+ to +false+ will allow additional keys to appear.
|
38
|
-
#
|
39
|
-
# @param [Hash] schema A Hash schema
|
40
|
-
# @param [Hash] options Options to change validation rules
|
41
|
-
# @option options [Boolean] :allow_extra_keys
|
42
|
-
# If +true+ does not fail when keys are in the data that are
|
43
|
-
# not specified in the schema. This allows new values to
|
44
|
-
# appear in API output without breaking the check.
|
45
|
-
# @option options [Boolean] :allow_optional_rules
|
46
|
-
# If +true+ does not fail if extra keys are in the schema
|
47
|
-
# that do not match the data. Not recommended!
|
48
|
-
# @yield Data to check with schema
|
49
|
-
#
|
50
|
-
# @example Using in a test
|
51
|
-
# Shindo.tests("comparing welcome data against schema") do
|
52
|
-
# data = {:welcome => "Hello" }
|
53
|
-
# data_matches_schema(:welcome => String) { data }
|
54
|
-
# end
|
55
|
-
#
|
56
|
-
# comparing welcome data against schema
|
57
|
-
# + data matches schema
|
58
|
-
#
|
59
|
-
# @example Example schema
|
60
|
-
# {
|
61
|
-
# "id" => String,
|
62
|
-
# "ram" => Integer,
|
63
|
-
# "disks" => [
|
64
|
-
# {
|
65
|
-
# "size" => Float
|
66
|
-
# }
|
67
|
-
# ],
|
68
|
-
# "dns_name" => Fog::Nullable::String,
|
69
|
-
# "active" => Fog::Boolean,
|
70
|
-
# "created" => DateTime
|
71
|
-
# }
|
72
|
-
#
|
73
|
-
# @return [Boolean]
|
74
|
-
def data_matches_schema(schema, options = {})
|
75
|
-
test('data matches schema') do
|
76
|
-
validator = Fog::Schema::DataValidator.new
|
77
|
-
valid = validator.validate(yield, schema, options)
|
78
|
-
@message = validator.message unless valid
|
79
|
-
valid
|
80
|
-
end
|
81
|
-
end
|
82
|
-
|
83
|
-
# @deprecated #formats is deprecated. Use #data_matches_schema instead
|
84
|
-
def formats(format, strict = true)
|
85
|
-
test('has proper format') do
|
86
|
-
if strict
|
87
|
-
options = {:allow_extra_keys => false, :allow_optional_rules => true}
|
88
|
-
else
|
89
|
-
options = {:allow_extra_keys => true, :allow_optional_rules => true}
|
90
|
-
end
|
91
|
-
validator = Fog::Schema::DataValidator.new
|
92
|
-
valid = validator.validate(yield, format, options)
|
93
|
-
@message = validator.message unless valid
|
94
|
-
valid
|
95
|
-
end
|
96
|
-
end
|
97
|
-
end
|
98
|
-
end
|
@@ -1,110 +0,0 @@
|
|
1
|
-
Shindo.tests('test_helper', 'meta') do
|
2
|
-
|
3
|
-
tests('comparing welcome data against schema') do
|
4
|
-
data = {:welcome => "Hello" }
|
5
|
-
data_matches_schema(:welcome => String) { data }
|
6
|
-
end
|
7
|
-
|
8
|
-
tests('#data_matches_schema') do
|
9
|
-
tests('when value matches schema expectation') do
|
10
|
-
data_matches_schema({"key" => String}) { {"key" => "Value"} }
|
11
|
-
end
|
12
|
-
|
13
|
-
tests('when values within an array all match schema expectation') do
|
14
|
-
data_matches_schema({"key" => [Integer]}) { {"key" => [1, 2]} }
|
15
|
-
end
|
16
|
-
|
17
|
-
tests('when nested values match schema expectation') do
|
18
|
-
data_matches_schema({"key" => {:nested_key => String}}) { {"key" => {:nested_key => "Value"}} }
|
19
|
-
end
|
20
|
-
|
21
|
-
tests('when collection of values all match schema expectation') do
|
22
|
-
data_matches_schema([{"key" => String}]) { [{"key" => "Value"}, {"key" => "Value"}] }
|
23
|
-
end
|
24
|
-
|
25
|
-
tests('when collection is empty although schema covers optional members') do
|
26
|
-
data_matches_schema([{"key" => String}], {:allow_optional_rules => true}) { [] }
|
27
|
-
end
|
28
|
-
|
29
|
-
tests('when additional keys are passed and not strict') do
|
30
|
-
data_matches_schema({"key" => String}, {:allow_extra_keys => true}) { {"key" => "Value", :extra => "Bonus"} }
|
31
|
-
end
|
32
|
-
|
33
|
-
tests('when value is nil and schema expects NilClass') do
|
34
|
-
data_matches_schema({"key" => NilClass}) { {"key" => nil} }
|
35
|
-
end
|
36
|
-
|
37
|
-
tests('when value and schema match as hashes') do
|
38
|
-
data_matches_schema({}) { {} }
|
39
|
-
end
|
40
|
-
|
41
|
-
tests('when value and schema match as arrays') do
|
42
|
-
data_matches_schema([]) { [] }
|
43
|
-
end
|
44
|
-
|
45
|
-
tests('when value is a Time') do
|
46
|
-
data_matches_schema({"time" => Time}) { {"time" => Time.now} }
|
47
|
-
end
|
48
|
-
|
49
|
-
tests('when key is missing but value should be NilClass (#1477)') do
|
50
|
-
data_matches_schema({"key" => NilClass}, {:allow_optional_rules => true}) { {} }
|
51
|
-
end
|
52
|
-
|
53
|
-
tests('when key is missing but value is nullable (#1477)') do
|
54
|
-
data_matches_schema({"key" => Fog::Nullable::String}, {:allow_optional_rules => true}) { {} }
|
55
|
-
end
|
56
|
-
end
|
57
|
-
|
58
|
-
tests('#formats backwards compatible changes') do
|
59
|
-
|
60
|
-
tests('when value matches schema expectation') do
|
61
|
-
formats({"key" => String}) { {"key" => "Value"} }
|
62
|
-
end
|
63
|
-
|
64
|
-
tests('when values within an array all match schema expectation') do
|
65
|
-
formats({"key" => [Integer]}) { {"key" => [1, 2]} }
|
66
|
-
end
|
67
|
-
|
68
|
-
tests('when nested values match schema expectation') do
|
69
|
-
formats({"key" => {:nested_key => String}}) { {"key" => {:nested_key => "Value"}} }
|
70
|
-
end
|
71
|
-
|
72
|
-
tests('when collection of values all match schema expectation') do
|
73
|
-
formats([{"key" => String}]) { [{"key" => "Value"}, {"key" => "Value"}] }
|
74
|
-
end
|
75
|
-
|
76
|
-
tests('when collection is empty although schema covers optional members') do
|
77
|
-
formats([{"key" => String}]) { [] }
|
78
|
-
end
|
79
|
-
|
80
|
-
tests('when additional keys are passed and not strict') do
|
81
|
-
formats({"key" => String}, false) { {"key" => "Value", :extra => "Bonus"} }
|
82
|
-
end
|
83
|
-
|
84
|
-
tests('when value is nil and schema expects NilClass') do
|
85
|
-
formats({"key" => NilClass}) { {"key" => nil} }
|
86
|
-
end
|
87
|
-
|
88
|
-
tests('when value and schema match as hashes') do
|
89
|
-
formats({}) { {} }
|
90
|
-
end
|
91
|
-
|
92
|
-
tests('when value and schema match as arrays') do
|
93
|
-
formats([]) { [] }
|
94
|
-
end
|
95
|
-
|
96
|
-
tests('when value is a Time') do
|
97
|
-
formats({"time" => Time}) { {"time" => Time.now} }
|
98
|
-
end
|
99
|
-
|
100
|
-
tests('when key is missing but value should be NilClass (#1477)') do
|
101
|
-
formats({"key" => NilClass}) { {} }
|
102
|
-
end
|
103
|
-
|
104
|
-
tests('when key is missing but value is nullable (#1477)') do
|
105
|
-
formats({"key" => Fog::Nullable::String}) { {} }
|
106
|
-
end
|
107
|
-
|
108
|
-
end
|
109
|
-
|
110
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
# Use so you can run in mock mode from the command line
|
2
|
-
#
|
3
|
-
# FOG_MOCK=true fog
|
4
|
-
|
5
|
-
if ENV["FOG_MOCK"] == "true"
|
6
|
-
Fog.mock!
|
7
|
-
end
|
8
|
-
|
9
|
-
# if in mocked mode, fill in some fake credentials for us
|
10
|
-
if Fog.mock?
|
11
|
-
Fog.credentials = {
|
12
|
-
:openstack_api_key => 'openstack_api_key',
|
13
|
-
:openstack_username => 'openstack_username',
|
14
|
-
:openstack_tenant => 'openstack_tenant',
|
15
|
-
:openstack_auth_url => 'http://openstack:35357/v2.0/tokens',
|
16
|
-
}.merge(Fog.credentials)
|
17
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
def model_tests(collection, params = {}, mocks_implemented = true)
|
2
|
-
tests('success') do
|
3
|
-
|
4
|
-
@instance = collection.new(params)
|
5
|
-
|
6
|
-
tests("#save").succeeds do
|
7
|
-
pending if Fog.mocking? && !mocks_implemented
|
8
|
-
@instance.save
|
9
|
-
end
|
10
|
-
|
11
|
-
if block_given?
|
12
|
-
yield(@instance)
|
13
|
-
end
|
14
|
-
|
15
|
-
tests("#destroy").succeeds do
|
16
|
-
pending if Fog.mocking? && !mocks_implemented
|
17
|
-
@instance.destroy
|
18
|
-
end
|
19
|
-
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
# Generates a unique identifier with a random differentiator.
|
24
|
-
# Useful when rapidly re-running tests, so we don't have to wait
|
25
|
-
# serveral minutes for deleted objects to disappear from the API
|
26
|
-
# E.g. 'fog-test-1234'
|
27
|
-
def uniq_id(base_name = 'fog-test')
|
28
|
-
# random_differentiator
|
29
|
-
suffix = rand(65536).to_s(16).rjust(4, '0')
|
30
|
-
[base_name, suffix] * '-'
|
31
|
-
end
|