mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
OpenStack rename flavor extra specs to metadata
This commit is contained in:
parent
2ed8c48cec
commit
7c2f4ea2e3
5 changed files with 22 additions and 22 deletions
|
@ -99,8 +99,8 @@ module Fog
|
|||
request :delete_flavor
|
||||
|
||||
# Flavor Actions
|
||||
request :get_flavor_extra_specs
|
||||
request :create_flavor_extra_specs
|
||||
request :get_flavor_metadata
|
||||
request :create_flavor_metadata
|
||||
|
||||
# Flavor Access
|
||||
request :add_flavor_access
|
||||
|
|
|
@ -13,7 +13,7 @@ module Fog
|
|||
attribute :links
|
||||
attribute :swap
|
||||
attribute :rxtx_factor
|
||||
attribute :extra_specs
|
||||
attribute :metadata
|
||||
attribute :ephemeral, :aliases => 'OS-FLV-EXT-DATA:ephemeral'
|
||||
attribute :is_public, :aliases => 'os-flavor-access:is_public'
|
||||
attribute :disabled, :aliases => 'OS-FLV-DISABLED:disabled'
|
||||
|
@ -41,14 +41,14 @@ module Fog
|
|||
true
|
||||
end
|
||||
|
||||
def extra_specs
|
||||
service.get_flavor_extra_specs(self.id).body['extra_specs']
|
||||
def metadata
|
||||
service.get_flavor_metadata(self.id).body['extra_specs']
|
||||
rescue Fog::Compute::OpenStack::NotFound
|
||||
nil
|
||||
end
|
||||
|
||||
def create_extra_specs(extra_specs)
|
||||
service.create_flavor_extra_specs(self.id, extra_specs)
|
||||
def create_metadata(metadata)
|
||||
service.create_flavor_metadata(self.id, metadata)
|
||||
rescue Fog::Compute::OpenStack::NotFound
|
||||
nil
|
||||
end
|
||||
|
|
|
@ -2,9 +2,9 @@ module Fog
|
|||
module Compute
|
||||
class OpenStack
|
||||
class Real
|
||||
def create_flavor_extra_specs(flavor_ref, extra_specs)
|
||||
def create_flavor_metadata(flavor_ref, metadata)
|
||||
data = {
|
||||
'extra_specs' => extra_specs
|
||||
'extra_specs' => metadata
|
||||
}
|
||||
|
||||
request(
|
||||
|
@ -17,7 +17,7 @@ module Fog
|
|||
end
|
||||
|
||||
class Mock
|
||||
def create_flavor_extra_specs(flavor_ref, extra_specs)
|
||||
def create_flavor_metadata(flavor_ref, metadata)
|
||||
response = Excon::Response.new
|
||||
response.status = 200
|
||||
response.headers = {
|
|
@ -2,7 +2,7 @@ module Fog
|
|||
module Compute
|
||||
class OpenStack
|
||||
class Real
|
||||
def get_flavor_extra_specs(flavor_ref)
|
||||
def get_flavor_metadata(flavor_ref)
|
||||
request(
|
||||
:expects => [200, 203],
|
||||
:method => 'GET',
|
||||
|
@ -12,7 +12,7 @@ module Fog
|
|||
end
|
||||
|
||||
class Mock
|
||||
def get_flavor_extra_specs(flavor_ref)
|
||||
def get_flavor_metadata(flavor_ref)
|
||||
response = Excon::Response.new
|
||||
response.status = 200
|
||||
response.body = { "extra_specs" => {
|
|
@ -49,13 +49,13 @@ Shindo.tests('Fog::Compute[:openstack] | flavor requests', ['openstack']) do
|
|||
Fog::Compute[:openstack].delete_flavor('100')
|
||||
end
|
||||
|
||||
tests('#get_flavor_extra_specs(flavor_ref)').data_matches_schema('extra_specs' => {'cpu_arch' => String}) do
|
||||
Fog::Compute[:openstack].get_flavor_extra_specs("1").body
|
||||
tests('#get_flavor_metadata(flavor_ref)').data_matches_schema('extra_specs' => {'cpu_arch' => String}) do
|
||||
Fog::Compute[:openstack].get_flavor_metadata("1").body
|
||||
end
|
||||
|
||||
tests('#create_flavor_extra_specs(flavor_ref, extra_specs)').data_matches_schema('extra_specs' => {'cpu_arch' => String}) do
|
||||
extra_specs = {:cpu_arch => 'x86_64'}
|
||||
Fog::Compute[:openstack].create_flavor_extra_specs("1", extra_specs).body
|
||||
tests('#create_flavor_metadata(flavor_ref, metadata)').data_matches_schema('extra_specs' => {'cpu_arch' => String}) do
|
||||
metadata = {:cpu_arch => 'x86_64'}
|
||||
Fog::Compute[:openstack].create_flavor_metadata("1", metadata).body
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -80,15 +80,15 @@ Shindo.tests('Fog::Compute[:openstack] | flavor requests', ['openstack']) do
|
|||
Fog::Compute[:openstack].list_tenants_with_flavor_access(1234)
|
||||
end
|
||||
|
||||
tests('get_flavor_extra_specs(flavor_ref)').raises(Fog::Compute::OpenStack::NotFound) do
|
||||
tests('get_flavor_metadata(flavor_ref)').raises(Fog::Compute::OpenStack::NotFound) do
|
||||
pending if Fog.mocking?
|
||||
Fog::Compute[:openstack].get_flavor_extra_specs("1234").body
|
||||
Fog::Compute[:openstack].get_flavor_metadata("1234").body
|
||||
end
|
||||
|
||||
tests('create_flavor_extra_specs(flavor_ref)').raises(Fog::Compute::OpenStack::NotFound) do
|
||||
tests('create_flavor_metadata(flavor_ref)').raises(Fog::Compute::OpenStack::NotFound) do
|
||||
pending if Fog.mocking?
|
||||
extra_specs = {:cpu_arch => 'x86_64'}
|
||||
Fog::Compute[:openstack].create_flavor_extra_specs("1234", extra_specs).body
|
||||
metadata = {:cpu_arch => 'x86_64'}
|
||||
Fog::Compute[:openstack].create_flavor_metadata("1234", metadata).body
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue